diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp
index ead7112958f..bd169af5b24 100644
--- a/src/plugins/qmldesigner/components/integration/designdocument.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp
@@ -311,21 +311,6 @@ void DesignDocument::changeToExternalSubComponent(const QString &fileName)
     Core::EditorManager::openEditor(fileName, Core::Id(), Core::EditorManager::DoNotMakeVisible);
 }
 
-void DesignDocument::goIntoSelectedComponent()
-{
-    if (currentModel())
-        return;
-
-    QList<ModelNode> selectedNodes;
-    if (rewriterView())
-        selectedNodes = view()->selectedModelNodes();
-
-    if (selectedNodes.count() == 1) {
-        viewManager().setComponentNode(selectedNodes.first());
-        DocumentManager::goIntoComponent(selectedNodes.first());
-    }
-}
-
 void DesignDocument::attachRewriterToModel()
 {
     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
diff --git a/src/plugins/qmldesigner/components/integration/designdocument.h b/src/plugins/qmldesigner/components/integration/designdocument.h
index 2e1b86d4a1e..234aeb15bbe 100644
--- a/src/plugins/qmldesigner/components/integration/designdocument.h
+++ b/src/plugins/qmldesigner/components/integration/designdocument.h
@@ -97,8 +97,6 @@ public:
 
     void resetToDocumentModel();
 
-    void goIntoSelectedComponent();
-
     void changeToDocumentModel();
 
 signals:
diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp
index 9d5650f43b0..7da83aff622 100644
--- a/src/plugins/qmldesigner/shortcutmanager.cpp
+++ b/src/plugins/qmldesigner/shortcutmanager.cpp
@@ -304,8 +304,12 @@ void ShortCutManager::redoAvailable(bool isAvailable)
 
 void ShortCutManager::goIntoComponent()
 {
-    if (currentDesignDocument())
-        currentDesignDocument()->goIntoSelectedComponent();
+    if (currentDesignDocument()
+            && currentDesignDocument()->currentModel()
+            && currentDesignDocument()->rewriterView()
+            && currentDesignDocument()->rewriterView()->hasSingleSelectedModelNode()) {
+        DocumentManager::goIntoComponent(currentDesignDocument()->rewriterView()->singleSelectedModelNode());
+    }
 }
 
 } // namespace QmlDesigner