diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp
index c8e83bc9195b3acddff1bbd7d12c2188ce6e702b..419c255882bc7b3c574ded6881665a10ae60a583 100644
--- a/src/plugins/coreplugin/designmode.cpp
+++ b/src/plugins/coreplugin/designmode.cpp
@@ -207,7 +207,7 @@ void DesignMode::unregisterDesignWidget(QWidget *widget)
 // if editor changes, check if we have valid mimetype registered.
 void DesignMode::currentEditorChanged(Core::IEditor *editor)
 {
-    if (d->m_currentEditor.data() == editor)
+    if (editor && (d->m_currentEditor.data() == editor))
         return;
 
     bool mimeEditorAvailable = false;
@@ -239,6 +239,8 @@ void DesignMode::currentEditorChanged(Core::IEditor *editor)
 
     if (!mimeEditorAvailable) {
         setActiveContext(QList<int>());
+        if (core->modeManager()->currentMode() == this)
+            core->modeManager()->activateMode(Core::Constants::MODE_EDIT);
         setEnabled(false);
         d->m_currentEditor = QWeakPointer<Core::IEditor>();
         emit actionsUpdated(d->m_currentEditor.data());