When you move him to the 20 gallon I would also consider covering up the back and sides with either a cling on background, black paper anything to basically keep them from seeing all around them, it will make him feel more secure.