diff --git a/src/plugins/fakevim/fakevim_test.cpp b/src/plugins/fakevim/fakevim_test.cpp
index 2e3125e9482..4a78decf998 100644
--- a/src/plugins/fakevim/fakevim_test.cpp
+++ b/src/plugins/fakevim/fakevim_test.cpp
@@ -3174,6 +3174,10 @@ void FakeVimPlugin::test_macros()
     KEYS("@x", "def" N X "abc");
     KEYS("gg@x", "abc" N X "def");
     data.doCommand("unmap <S-down>");
+
+    data.setText("   abc xyz>." N "   def xyz>." N "   ghi xyz>." N "   jkl xyz>.");
+    KEYS("qq" "^wdf>j" "q", "   abc ." N "   def " X "xyz>." N "   ghi xyz>." N "   jkl xyz>.");
+    KEYS("2@q", "   abc ." N "   def ." N "   ghi ." N "   jkl " X "xyz>.");
 }
 
 void FakeVimPlugin::test_vim_qtcreator()
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 4e9c2d05d1a..5857665d2ee 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -725,6 +725,7 @@ static const QMap<QString, int> &vimKeyNames()
     k.insert(_("RIGHT"), Key_Right);
 
     k.insert(_("LT"), Key_Less);
+    k.insert(_("GT"), Key_Greater);
 
     k.insert(_("F1"), Key_F1);
     k.insert(_("F2"), Key_F2);
@@ -1007,6 +1008,8 @@ public:
         if (!namedKey) {
             if (m_xkey == '<')
                 key = _("<LT>");
+            else if (m_xkey == '>')
+                key = _("<GT>");
             else
                 key = QChar(m_xkey);
         }