diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index 10f21222662..88f4b7726fb 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -25,8 +25,10 @@
 
 #include "cmakekitinformation.h"
 #include "cmakeprojectconstants.h"
-#include "cmaketoolmanager.h"
+#include "cmakeprojectplugin.h"
+#include "cmakespecificsettings.h"
 #include "cmaketool.h"
+#include "cmaketoolmanager.h"
 
 #include <app/app_version.h>
 #include <coreplugin/icore.h>
@@ -611,10 +613,19 @@ QVariant CMakeGeneratorKitAspect::defaultValue(const Kit *k) const
         return g.matches("Ninja", extraGenerator);
     });
     if (it != known.constEnd()) {
-        Utils::Environment env = Utils::Environment::systemEnvironment();
-        k->addToEnvironment(env);
-        const Utils::FilePath ninjaExec = env.searchInPath(QLatin1String("ninja"));
-        if (!ninjaExec.isEmpty())
+        const bool hasNinja = [k]() {
+            Internal::CMakeSpecificSettings *settings
+                = Internal::CMakeProjectPlugin::projectTypeSpecificSettings();
+
+            if (settings->ninjaPath().isEmpty()) {
+                Utils::Environment env = Utils::Environment::systemEnvironment();
+                k->addToEnvironment(env);
+                return !env.searchInPath("ninja").isEmpty();
+            }
+            return true;
+        }();
+
+        if (hasNinja)
             return GeneratorInfo({QString("Ninja"), extraGenerator, QString(), QString()}).toVariant();
     }
 
diff --git a/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp b/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp
index 4f2657fba87..bce46e68c05 100644
--- a/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp
+++ b/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp
@@ -139,8 +139,8 @@ void HighlightScrollBarOverlay::paintEvent(QPaintEvent *paintEvent)
 
     const int aboveValue = m_scrollBar->value();
     const int belowValue = m_scrollBar->maximum() - m_scrollBar->value();
-    const int sizeDocAbove = aboveValue * int(m_highlightController->lineHeight());
-    const int sizeDocBelow = belowValue * int(m_highlightController->lineHeight());
+    const int sizeDocAbove = int(aboveValue * m_highlightController->lineHeight());
+    const int sizeDocBelow = int(belowValue * m_highlightController->lineHeight());
     const int sizeDocVisible = int(m_highlightController->visibleRange());
 
     const int scrollBarBackgroundHeight = aboveHandleRect.height() + belowHandleRect.height();