diff --git a/src/main.cpp b/src/main.cpp
index 11e1a8d..b7c3cef 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1631,7 +1631,7 @@ int main(int argc, char *argv[])
 			}
 			
 			// Break out of menu-game loop to shut down cleanly
-			if(device->run() == false)
+			if(device->run() == false || kill == true)
 				break;
 			
 			/*