diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 57d3a52716e..4bcf9fbab13 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -241,8 +241,8 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
         SLOT(showLinkInHelpMode(QUrl)));
 
     QDesktopServices::setUrlHandler(QLatin1String("qthelp"), HelpManager::instance(), "handleHelpRequest");
-    connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)),
-            this, SLOT(modeChanged(Core::IMode*,Core::IMode*)));
+    connect(ModeManager::instance(), &ModeManager::currentModeChanged,
+            this, &HelpPlugin::modeChanged);
 
     m_mode = new HelpMode;
     m_mode->setWidget(m_centralWidget);
@@ -445,10 +445,10 @@ void HelpPlugin::slotHideRightPane()
     RightPaneWidget::instance()->setShown(false);
 }
 
-void HelpPlugin::modeChanged(IMode *mode, IMode *old)
+void HelpPlugin::modeChanged(Core::Id mode, Core::Id old)
 {
     Q_UNUSED(old)
-    if (mode == m_mode) {
+    if (mode == m_mode->id()) {
         qApp->setOverrideCursor(Qt::WaitCursor);
         doSetupIfNeeded();
         qApp->restoreOverrideCursor();
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 9991704610c..b4a98a5a7df 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -42,7 +42,6 @@ class QUrl;
 QT_END_NAMESPACE
 
 namespace Core {
-class IMode;
 class MiniSplitter;
 class SideBar;
 class SideBarItem;
@@ -79,7 +78,7 @@ public:
     static HelpViewer *createHelpViewer(qreal zoom);
 
 private slots:
-    void modeChanged(Core::IMode *mode, Core::IMode *old);
+    void modeChanged(Core::Id mode, Core::Id old);
 
     void showContextHelp();
     void activateIndex();
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index b46ffd557ec..473c585520f 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -203,9 +203,8 @@ void QmlDesignerPlugin::createDesignModeWidget()
             this,
             SLOT(onTextEditorsClosed(QList<Core::IEditor*>)));
 
-    connect(Core::ModeManager::instance(),
-            SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)),
-            SLOT(onCurrentModeChanged(Core::IMode*,Core::IMode*)));
+    connect(Core::ModeManager::instance(), &Core::ModeManager::currentModeChanged,
+            this, &QmlDesignerPlugin::onCurrentModeChanged);
 
 }
 
@@ -392,21 +391,21 @@ void QmlDesignerPlugin::onCurrentEditorChanged(Core::IEditor *editor)
     }
 }
 
-static bool isDesignerMode(Core::IMode *mode)
+static bool isDesignerMode(Core::Id mode)
 {
-    return mode == Core::DesignMode::instance();
+    return mode == Core::DesignMode::instance()->id();
 }
 
 
 
-static bool documentIsAlreadyOpen(DesignDocument *designDocument, Core::IEditor *editor, Core::IMode *newMode)
+static bool documentIsAlreadyOpen(DesignDocument *designDocument, Core::IEditor *editor, Core::Id newMode)
 {
     return designDocument
             && editor == designDocument->editor()
             && isDesignerMode(newMode);
 }
 
-void QmlDesignerPlugin::onCurrentModeChanged(Core::IMode *newMode, Core::IMode *oldMode)
+void QmlDesignerPlugin::onCurrentModeChanged(Core::Id newMode, Core::Id oldMode)
 {
     if (data
             && Core::EditorManager::currentEditor()
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.h b/src/plugins/qmldesigner/qmldesignerplugin.h
index 2190a596420..e71f6d355d3 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.h
+++ b/src/plugins/qmldesigner/qmldesignerplugin.h
@@ -44,7 +44,6 @@ QT_END_NAMESPACE
 
 namespace Core {
     class IEditor;
-    class IMode;
 }
 
 namespace QmlDesigner {
@@ -90,7 +89,7 @@ private slots:
     void switschToTextMode();
     void onTextEditorsClosed(QList<Core::IEditor *> editors);
     void onCurrentEditorChanged(Core::IEditor *editor);
-    void onCurrentModeChanged(Core::IMode *mode, Core::IMode *oldMode);
+    void onCurrentModeChanged(Core::Id mode, Core::Id oldMode);
 
 private: // functions
     void createDesignModeWidget();