diff --git a/windows/winpgnt.c b/windows/winpgnt.c
index 58b5af70..e9d91e3d 100644
--- a/windows/winpgnt.c
+++ b/windows/winpgnt.c
@@ -304,7 +304,7 @@ void keylist_update(void)
             pos = 0;
             while (1) {
                 pos += strcspn(listentry + pos, " :");
-                if (listentry[pos] == ':')
+                if (listentry[pos] == ':' || !listentry[pos])
                     break;
                 listentry[pos++] = '\t';
             }