diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 10afe6c9bb8..2842cbdbca5 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -7157,8 +7157,8 @@ void FakeVimHandler::Private::undoRedo(bool undo)
     ++m_editBlockLevel;
 
     // Do undo/redo [count] times to reach previous revision.
-    int count = m_undoState.isValid() ? m_undoState.revisions
-                                      : state.isValid() ? state.revisions : 1;
+    int count = qMax(1, m_undoState.isValid() ? m_undoState.revisions
+                                              : state.revisions);
     while (count-- > 0) {
         if (undo)
             EDITOR(undo());