diff --git a/src/plugins/debugger/interface/stackframemodel.cpp b/src/plugins/debugger/interface/stackframemodel.cpp
index 13b1b2a80..a14fa024d 100644
--- a/src/plugins/debugger/interface/stackframemodel.cpp
+++ b/src/plugins/debugger/interface/stackframemodel.cpp
@@ -148,6 +148,7 @@ void StackFrameModel::setFrames(const StackFrames &frames, bool canExpand)
     contentsValid = true;
     this->canExpand = canExpand;
     stackFrames = frames;
+    currentIndex = 1;
 
     if (stackFrames.size() > 0) {
         for (int i = 0; i < stackFrames.size(); i++) {
@@ -157,8 +158,6 @@ void StackFrameModel::setFrames(const StackFrames &frames, bool canExpand)
                 break;
             }
         }
-    } else {
-        currentIndex = -1;
     }
 
     endResetModel();
diff --git a/src/tools/debugadapter/debugmanager.cpp b/src/tools/debugadapter/debugmanager.cpp
index 45491288c..b62948693 100644
--- a/src/tools/debugadapter/debugmanager.cpp
+++ b/src/tools/debugadapter/debugmanager.cpp
@@ -56,7 +56,7 @@ void DebugManager::initProcess()
 {
     d->process.reset(new QProcess());
 
-    connect(d->process.data(), &QProcess::readyReadStandardOutput, [this]() {
+    connect(d->process.data(), &QProcess::readyReadStandardOutput, d->process.data(), [this]() {
         QString output = d->process->readAllStandardOutput();
 
         for (const auto& c: output)
@@ -77,7 +77,7 @@ void DebugManager::initProcess()
             }
             }
     });
-    connect(d->process.data(), &QProcess::readyReadStandardError, [this]() {
+    connect(d->process.data(), &QProcess::readyReadStandardError, d->process.data(), [this]() {
         QString output = d->process->readAllStandardError();
         for (const auto& c: output)
             switch (c.toLatin1()) {
@@ -97,7 +97,7 @@ void DebugManager::initProcess()
             }
     });
 
-    connect(d->process.data(), &QProcess::started, [this]() {
+    connect(d->process.data(), &QProcess::started, d->process.data(), [this]() {
         d->tokenCounter = 0;
         d->tempBuffer.clear();
         d->resposeExpected.clear();