diff --git a/source/core/cheathandler.cpp b/source/core/cheathandler.cpp
index edc982c96..f06908f0c 100644
--- a/source/core/cheathandler.cpp
+++ b/source/core/cheathandler.cpp
@@ -69,10 +69,10 @@ static bool CheatAddKey (cheatseq_t *cheat, uint8_t key, bool *eat)
 		cheat->Pos = cheat->Sequence;
 		cheat->CurrentArg = 0;
 	}
-	if (*cheat->Pos == '#' && key >= '0' && key <= '9')
+	if (*cheat->Pos == '#' && (key >= '0' && key <= '9') || key == ' ')
 	{
 		*eat = true;
-		cheat->Args[cheat->CurrentArg++] = key;
+		cheat->Args[cheat->CurrentArg++] = key == ' ' ? '0' : key;
 		cheat->Pos++;
 	}
 	else if (upperforlower[key] == upperforlower[*cheat->Pos])