diff --git a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
index 0847199d23e..594e1ceec15 100644
--- a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
+++ b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
@@ -49,11 +49,7 @@ private:
                 return MesonToolKitAspect::mesonToolId(m_kit);
             return NinjaToolKitAspect::ninjaToolId(m_kit);
         }();
-        if (id.isValid())
-            m_toolsComboBox->setCurrentIndex(indexOf(id));
-        else {
-            setToDefault();
-        }
+        m_toolsComboBox->setCurrentIndex(indexOf(id));
     }
 
     QComboBox *m_toolsComboBox;
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 75117598d35..03164abb36b 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -1020,6 +1020,8 @@ void TextEditorWidgetFind::selectAll(const QString &txt, FindFlags findFlags)
         if (future.resultCount() <= 0)
             return;
         const SearchResultItems &results = future.result();
+        if (results.isEmpty())
+            return;
         const auto cursorForResult = [this](const SearchResultItem &item) {
             return selectRange(m_editor->document(), item.mainRange());
         };