diff --git a/src/nvim/version.c b/src/nvim/version.c
index 6b9c8bf6b1..54f03cd3dd 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -2570,7 +2570,11 @@ static void list_features(void)
         }
       } else {
         while (msg_col % width) {
+          int old_msg_col = msg_col;
           msg_putchar(' ');
+          if (old_msg_col == msg_col) {
+            break;  // XXX: Avoid infinite loop.
+          }
         }
       }
     } else {