diff --git a/python/GafferUI/Viewer.py b/python/GafferUI/Viewer.py
index 1601d1e3c67..c1753404c04 100644
--- a/python/GafferUI/Viewer.py
+++ b/python/GafferUI/Viewer.py
@@ -336,11 +336,11 @@ def setNode( self, node ) :
 		if self.__node is not None :
 			toolbar = self.__nodeToolbarCache.get( ( self.__node, self.__edge ) )
 			self.setChild( toolbar )
+			self.setVisible( True )
 		else :
+			self.setVisible( False )
 			self.setChild( None )
 
-		self.setVisible( self.getChild() is not None )
-
 	def getNode( self ) :
 
 		return self.__node