1 files changed, 10 insertions, 7 deletions

diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 250df59f8..b0aa1e561 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -32,14 +32,17 @@ void EmuThread::run()
 {
     while (true)
     {
-        if (cpu_running || exec_cpu_step)
+        for (int tight_loop = 0; tight_loop < 10000; ++tight_loop)
         {
-            if (exec_cpu_step)
-                exec_cpu_step = false;
-
-            Core::SingleStep();
-            if (!cpu_running)
-                emit CPUStepped();
+            if (cpu_running || exec_cpu_step)
+            {
+                if (exec_cpu_step)
+                    exec_cpu_step = false;
+
+                Core::SingleStep();
+                if (!cpu_running)
+                    emit CPUStepped();
+            }
         }
     }