diff --git a/engine/client/keys.c b/engine/client/keys.c
index e2d6a5c73..169b126f1 100644
--- a/engine/client/keys.c
+++ b/engine/client/keys.c
@@ -504,6 +504,8 @@ void CompleteCommand (qboolean force, int direction)
 	cmd_completion_t *c;
 
 	s = key_lines[edit_line];
+	if (!*s)
+		return;
 	if (*s == ' ' || *s == '\t')
 		s++;
 	if (*s == '\\' || *s == '/')