diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp
index abc1daaa83..3e0796be2f 100644
--- a/pcsx2/gui/AppInit.cpp
+++ b/pcsx2/gui/AppInit.cpp
@@ -463,6 +463,8 @@ bool Pcsx2App::OnInit()
 			{
 				g_Conf->Folders.RunELF = elfFile.GetPath();
 				sApp.SysExecute(Startup.CdvdSource, Startup.ElfFile);
+				if (Startup.ElfFile.Find(' ') == NULL)
+					EmuConfig.CurrentGameArgs = StringUtil::wxStringToUTF8String(Startup.GameLaunchArgs);
 			}
 		}
 		else if (Startup.SysAutoRunIrx)
@@ -473,6 +475,8 @@ bool Pcsx2App::OnInit()
 
 			// FIXME: ElfFile is an irx it will crash
 			sApp.SysExecute(Startup.CdvdSource, Startup.ElfFile);
+			if (Startup.ElfFile.Find(' ') == NULL)
+				EmuConfig.CurrentGameArgs = StringUtil::wxStringToUTF8String(Startup.GameLaunchArgs);
 		}
 	}
 	// ----------------------------------------------------------------------------