diff --git a/source/CmdLine.cpp b/source/CmdLine.cpp
index 4c9cc36f..2dbccffe 100644
--- a/source/CmdLine.cpp
+++ b/source/CmdLine.cpp
@@ -52,7 +52,7 @@ bool g_bHookAltGrControl = false;
 
 static LPSTR GetCurrArg(LPSTR lpCmdLine)
 {
-	if(*lpCmdLine == '\"')
+	if (*lpCmdLine == '\"')
 		lpCmdLine++;
 
 	return lpCmdLine;
@@ -62,9 +62,9 @@ static LPSTR GetNextArg(LPSTR lpCmdLine)
 {
 	int bInQuotes = 0;
 
-	while(*lpCmdLine)
+	while (*lpCmdLine)
 	{
-		if(*lpCmdLine == '\"')
+		if (*lpCmdLine == '\"')
 		{
 			bInQuotes ^= 1;
 			if(!bInQuotes)
@@ -74,9 +74,12 @@ static LPSTR GetNextArg(LPSTR lpCmdLine)
 			}
 		}
 
-		if((*lpCmdLine == ' ') && !bInQuotes)
+		if ((*lpCmdLine == ' ') && !bInQuotes)
 		{
 			*lpCmdLine++ = 0x00;
+
+			while ((*lpCmdLine == ' '))	// Skip multiple spaces between args
+				lpCmdLine++;
 			break;
 		}