diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index dd7c125f167..1e1e3d70e68 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -2787,6 +2787,7 @@ EventResult FakeVimHandler::Private::handleCommandMode1(const Input &input)
         needle = "\\<" + tc.selection().toPlainText() + "\\>";
         setAnchorAndPosition(tc.position(), tc.anchor());
         g.searchBuffer.historyPush(needle);
+        m_lastSearch = needle;
         m_lastSearchForward = input.is('*');
         searchNext();
         finishMovement();
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 586d790b6cc..54aab1ca9fa 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -1756,7 +1756,7 @@ void FakeVimPluginPrivate::highlightMatches(const QString &needle)
     QWidget *w = editor->widget();
     Find::IFindSupport *find = Aggregation::query<Find::IFindSupport>(w);
     if (find != 0)
-        find->highlightAll(needle, Find::FindRegularExpression);
+        find->highlightAll(needle, Find::FindRegularExpression | Find::FindCaseSensitively);
 }
 
 int FakeVimPluginPrivate::currentFile() const