diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 5bf7c32675d..d1ab5b40630 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -114,7 +114,7 @@ private slots:
     void editorOpened(Core::IEditor *);
     void editorAboutToClose(Core::IEditor *);
 
-    void installHandler();
+    void installHandlerOnCurrentEditor();
     void installHandler(Core::IEditor *editor);
     void removeHandler();
 
@@ -171,7 +171,7 @@ bool FakeVimPluginPrivate::initialize()
     advancedMenu->addAction(cmd, Core::Constants::G_EDIT_EDITOR);
 
     connect(m_installHandlerAction, SIGNAL(triggered()),
-        this, SLOT(installHandler()));
+        this, SLOT(installHandlerOnCurrentEditor()));
 
     // EditorManager
     QObject *editorManager = m_core->editorManager();
@@ -221,6 +221,11 @@ void FakeVimPluginPrivate::installHandler(Core::IEditor *editor)
     }
 }
 
+void FakeVimPluginPrivate::installHandlerOnCurrentEditor()
+{
+    installHandler(EditorManager::instance()->currentEditor());
+}
+
 void FakeVimPluginPrivate::writeFile(bool *handled,
     const QString &fileName, const QString &contents)
 {