diff --git a/desmume/src/frontend/windows/main.cpp b/desmume/src/frontend/windows/main.cpp
index 1a603b88e..d3842c6af 100755
--- a/desmume/src/frontend/windows/main.cpp
+++ b/desmume/src/frontend/windows/main.cpp
@@ -1800,6 +1800,8 @@ class WinDriver : public BaseDriver
 
 		CheckMessages();
 
+		if(finished) ExitProcess(0); //I guess.... fixes hangs when exiting while a lua script is running
+
 		if(!romloaded)
 			return ESTEP_DONE;