diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index edddd9f61c06e4e5e2386807f420e8be8ccd2c9f..bee8f61ef07b013415ae64d24f38ab9c1f16631b 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -1585,6 +1585,7 @@ EventResult FakeVimHandler::Private::handleInsertMode(int key, int,
     } else if (key >= control('a') && key <= control('z')) {
         // ignore these
     } else if (!text.isEmpty()) {
+        m_justAutoIndented = false;
         m_lastInsertion.append(text);
         if (m_submode == ReplaceSubMode) {
             if (atEndOfLine())
diff --git a/tests/manual/fakevim/main.cpp b/tests/manual/fakevim/main.cpp
index ec007922ff85a19cf55e9e7cd303eda21d672a51..0b4e1c612621effcb4096dde52ef9a457d93ce17 100644
--- a/tests/manual/fakevim/main.cpp
+++ b/tests/manual/fakevim/main.cpp
@@ -121,6 +121,7 @@ int main(int argc, char *argv[])
     theFakeVimSetting(ConfigUseFakeVim)->setValue(true);
     theFakeVimSetting(ConfigShiftWidth)->setValue(8);
     theFakeVimSetting(ConfigTabStop)->setValue(8);
+    theFakeVimSetting(ConfigAutoIndent)->setValue(true);
 
     handler.installEventFilter();
     handler.setupWidget();