diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index e8dbfef50735d62ef8a9258565ea8a6dd9facb44..8ffac852075c3701da22e6a0e803315aa5dbb4d1 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -959,7 +959,6 @@ public:
         const QString &stopButtonText, const QString &cancelButtonText) const;
 
     void registerAction(Core::Id actionId, const ActionDescription &desc, QAction *startAction);
-    void selectPerspective(const QByteArray &perspectiveId);
 
     // Called when all dependent plugins have loaded.
     void initialize();
@@ -3421,11 +3420,6 @@ void DebuggerPluginPrivate::onModeChanged(IMode *mode)
     }
 }
 
-void DebuggerPluginPrivate::selectPerspective(const QByteArray &perspectiveId)
-{
-    m_mainWindow->restorePerspective(perspectiveId);
-}
-
 void DebuggerPluginPrivate::registerAction(Id actionId, const ActionDescription &desc, QAction *startAction)
 {
     auto action = new QAction(this);
@@ -3616,8 +3610,11 @@ void registerPerspective(const QByteArray &perspectiveId, const Perspective &per
 
 void selectPerspective(const QByteArray &perspectiveId)
 {
+    // FIXME: Work-around aslong as the GammaRay integration does not use the same setup,
+    if (perspectiveId.isEmpty())
+        return;
     ModeManager::activateMode(MODE_DEBUG);
-    dd->selectPerspective(perspectiveId);
+    dd->m_mainWindow->restorePerspective(perspectiveId);
 }
 
 void runAction(Id actionId)