diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
index fb770c3cc3d..62f7030c6d8 100644
--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
@@ -406,6 +406,7 @@ ExternalToolConfig::ExternalToolConfig(QWidget *parent) :
     m_model(new ExternalToolModel(this))
 {
     ui->setupUi(this);
+    ui->executable->setExpectedKind(Utils::PathChooser::ExistingCommand);
     ui->scrollArea->viewport()->setAutoFillBackground(false);
     ui->scrollAreaWidgetContents->setAutoFillBackground(false);
     ui->toolTree->setModel(m_model);
diff --git a/src/plugins/debugger/threadshandler.cpp b/src/plugins/debugger/threadshandler.cpp
index 017e1839623..24ec22c693c 100644
--- a/src/plugins/debugger/threadshandler.cpp
+++ b/src/plugins/debugger/threadshandler.cpp
@@ -409,7 +409,7 @@ void ThreadsHandler::setThreads(const GdbMi &data)
     if (!m_currentThread && threads.childCount() > 0)
         m_currentThread = rootItem()->childAt(0);
 
-    if (!m_currentThread) {
+    if (m_currentThread) {
         const QModelIndex currentThreadIndex = m_currentThread->index();
         threadSwitcher()->setCurrentIndex(currentThreadIndex.row());
     }