diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 3eec0f8d805..044978fb35a 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -2248,6 +2248,16 @@ EventResult FakeVimHandler::Private::handleInsertMode(const Input &input)
         moveRight(count());
         setTargetColumn();
         m_lastInsertion.clear();
+    } else if (key == Key_Home) {
+        moveToStartOfLine();
+        setTargetColumn();
+        m_lastInsertion.clear();
+    } else if (key == Key_End) {
+        if (count() > 1)
+            moveDown(count() - 1);
+        moveBehindEndOfLine();
+        setTargetColumn();
+        m_lastInsertion.clear();
     } else if (key == Key_Return) {
         m_submode = NoSubMode;
         m_tc.insertBlock();