diff --git a/src/Cutter.cpp b/src/Cutter.cpp
index b6998a10..bbcad235 100644
--- a/src/Cutter.cpp
+++ b/src/Cutter.cpp
@@ -907,7 +907,7 @@ void CutterCore::startEmulation()
     emit registersChanged();
     if (!currentlyDebugging || !currentlyEmulating) {
         // prevent register flags from appearing during debug/emul
-        setConfig("asm.flags", false);
+        // setConfig("asm.flags", false);
         // allows to view self-modifying code changes or other binary changes
         setConfig("io.cache", true);
         currentlyDebugging = true;
@@ -977,10 +977,10 @@ void CutterCore::continueDebug()
 void CutterCore::continueUntilDebug(QString offset)
 {
     if (currentlyDebugging) {
-        if (!currentlyEmulating) {
-            cmd("dcu " + offset);
-        } else {
+        if (currentlyEmulating) {
             cmdEsil("aecu " + offset);
+        } else {
+            cmd("dcu " + offset);
         }
         emit registersChanged();
         emit refreshCodeViews();