diff --git a/src/Cutter.cpp b/src/Cutter.cpp
index cdd5d901..b6998a10 100644
--- a/src/Cutter.cpp
+++ b/src/Cutter.cpp
@@ -964,7 +964,11 @@ void CutterCore::stopDebug()
 void CutterCore::continueDebug()
 {
     if (currentlyDebugging) {
-        cmd("dc");
+        if (currentlyEmulating) {
+            cmdEsil("aec");
+        } else {
+            cmd("dc");
+        }
         emit registersChanged();
         emit refreshCodeViews();
     }
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 0c776a5b..09a2f8ab 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -132,16 +132,16 @@ void MainWindow::initUI()
     DebugToolbar *debugToolbar = new DebugToolbar(this);
     ui->mainToolBar->addWidget(debugToolbar);
     // Debug menu
-    // ui->menuDebug->addAction(debugToolbar->actionStart);
+    ui->menuDebug->addAction(debugToolbar->actionStart);
     ui->menuDebug->addAction(debugToolbar->actionStartEmul);
-    // ui->menuDebug->addAction(debugToolbar->actionAttach);
+    ui->menuDebug->addAction(debugToolbar->actionAttach);
     ui->menuDebug->addSeparator();
     ui->menuDebug->addAction(debugToolbar->actionStep);
     ui->menuDebug->addAction(debugToolbar->actionStepOver);
     ui->menuDebug->addAction(debugToolbar->actionStepOut);
     ui->menuDebug->addSeparator();
-    // ui->menuDebug->addAction(debugToolbar->actionContinue);
-    // ui->menuDebug->addAction(debugToolbar->actionContinueUntilCall);
+    ui->menuDebug->addAction(debugToolbar->actionContinue);
+    ui->menuDebug->addAction(debugToolbar->actionContinueUntilCall);
     ui->menuDebug->addAction(debugToolbar->actionContinueUntilSyscall);
 
     // Sepparator between undo/redo and goto lineEdit
diff --git a/src/menus/DisassemblyContextMenu.cpp b/src/menus/DisassemblyContextMenu.cpp
index bef6bc45..ab53c839 100644
--- a/src/menus/DisassemblyContextMenu.cpp
+++ b/src/menus/DisassemblyContextMenu.cpp
@@ -299,9 +299,6 @@ void DisassemblyContextMenu::aboutToShowSlot()
 
     // only show debug options if we are currently debugging
     debugMenu->menuAction()->setVisible(Core()->currentlyDebugging);
-    // currently there are is no breakpoint support in ESIL so
-    // we dont show the option in case we are emulating
-    actionAddBreakpoint.setVisible(!Core()->currentlyEmulating);
     QString progCounterName = Core()->getRegisterName("PC");
     actionSetPC.setText("Set " + progCounterName + " here");