diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp
index e4620cc605..b6ad7e4887 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp
@@ -159,13 +159,16 @@ void Video_EnterLoop()
 
     while (fifoStateRun)
     {
-        if (!CommandProcessor::RunBuffer())
+		g_VideoInitialize.pPeekMessages();
+		if (!CommandProcessor::RunBuffer()) {
             Common::SleepCurrentThread(1);
+		}
     }
 }
 
 void Video_ExitLoop()
 {
+	fifoStateRun = false;
 }
 
 void Video_AddMessage(const char* pstr, u32 milliseconds)