diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index e01c3296899..895b646b0f1 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -2824,6 +2824,13 @@ EventResult FakeVimHandler::Private::handleExMode(const Input &input)
             m_commandBuffer.chop(1);
         }
         updateMiniBuffer();
+    } else if (input.isKey(Key_Tab)) {
+        QStringList completions;
+        foreach (const QString &entry, g.commandHistory.items()) {
+            if (entry.startsWith(m_commandBuffer))
+                completions.append(entry);
+        }
+        qDebug() << completions;
     } else if (input.isKey(Key_Left)) {
         // FIXME:
         if (!m_commandBuffer.isEmpty())