diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index e5f2bc23385..c1a48b95ad7 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -283,16 +283,15 @@ void QmlDesignerPlugin::integrateIntoQtCreator(QWidget *modeWidget)
         if (d && currentEditor && checkIfEditorIsQtQuick(currentEditor) &&
                 !documentIsAlreadyOpen(currentDesignDocument(), currentEditor, newMode)) {
 
-            if (!isDesignerMode(newMode) && isDesignerMode(oldMode))
-                hideDesigner();
-            else if (currentEditor && isDesignerMode(newMode))
+            if (isDesignerMode(newMode)) {
                 showDesigner();
-            else if (currentDesignDocument())
-                hideDesigner();
+            } else if (currentDesignDocument() ||
+                     (!isDesignerMode(newMode) && isDesignerMode(oldMode))) {
+                    hideDesigner();
+            }
         }
     });
 
-
     d->viewManager.designerActionManager().polishActions();
 }