diff --git a/org.eclipse.xtext.xbase.ui/src/org/eclipse/xtext/xbase/ui/hover/XbaseInformationControl.java b/org.eclipse.xtext.xbase.ui/src/org/eclipse/xtext/xbase/ui/hover/XbaseInformationControl.java
index 980972f764a..d8cdd82205d 100644
--- a/org.eclipse.xtext.xbase.ui/src/org/eclipse/xtext/xbase/ui/hover/XbaseInformationControl.java
+++ b/org.eclipse.xtext.xbase.ui/src/org/eclipse/xtext/xbase/ui/hover/XbaseInformationControl.java
@@ -514,8 +514,6 @@ public static boolean isAvailable(Composite parent) {
 	@Override
 	public void setVisible(boolean visible) {
 		Shell shell = getShell();
-		if (shell.isVisible() == visible)
-			return;
 
 		if (!visible) {
 			super.setVisible(false);
@@ -523,6 +521,9 @@ public void setVisible(boolean visible) {
 			startDisposeTimeout(shell.getDisplay());
 			return;
 		}
+		
+		if (shell.isVisible() == visible)
+			return;
 
 		/*
 		 * The Browser widget flickers when made visible while it is not completely loaded.