diff --git a/src/plugins/cppcheck/cppcheckmanualrundialog.cpp b/src/plugins/cppcheck/cppcheckmanualrundialog.cpp
index d38a424b6b1..35a057ccffd 100644
--- a/src/plugins/cppcheck/cppcheckmanualrundialog.cpp
+++ b/src/plugins/cppcheck/cppcheckmanualrundialog.cpp
@@ -10,6 +10,7 @@
 
 #include <cppeditor/projectinfo.h>
 
+#include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 
 #include <QBoxLayout>
@@ -18,8 +19,7 @@
 
 namespace Cppcheck::Internal {
 
-ManualRunDialog::ManualRunDialog(QWidget *optionsWidget,
-                                 const ProjectExplorer::Project *project)
+ManualRunDialog::ManualRunDialog(const ProjectExplorer::Project *project)
     : m_model(new ProjectExplorer::SelectableFilesFromDirModel(this))
 {
     QTC_ASSERT(project, return );
@@ -52,6 +52,8 @@ ManualRunDialog::ManualRunDialog(QWidget *optionsWidget,
         analyzeButton->setEnabled(m_model->hasCheckedFiles());
     });
 
+    auto optionsWidget = settings().layouter()().emerge();
+
     auto layout = new QVBoxLayout(this);
     layout->addWidget(optionsWidget);
     layout->addWidget(view);
diff --git a/src/plugins/cppcheck/cppcheckmanualrundialog.h b/src/plugins/cppcheck/cppcheckmanualrundialog.h
index 460a85e75c4..76206578e34 100644
--- a/src/plugins/cppcheck/cppcheckmanualrundialog.h
+++ b/src/plugins/cppcheck/cppcheckmanualrundialog.h
@@ -20,7 +20,7 @@ namespace Cppcheck::Internal {
 class ManualRunDialog : public QDialog
 {
 public:
-    ManualRunDialog(QWidget *optionsWidget, const ProjectExplorer::Project *project);
+    explicit ManualRunDialog(const ProjectExplorer::Project *project);
 
     Utils::FilePaths filePaths() const;
     QSize sizeHint() const override;
diff --git a/src/plugins/cppcheck/cppcheckplugin.cpp b/src/plugins/cppcheck/cppcheckplugin.cpp
index f8096350293..261eb50b0a5 100644
--- a/src/plugins/cppcheck/cppcheckplugin.cpp
+++ b/src/plugins/cppcheck/cppcheckplugin.cpp
@@ -112,9 +112,7 @@ void CppcheckPluginPrivate::startManualRun()
 
     manualRunTool.updateOptions();
 
-    auto optionsWidget = settings().layouter()().emerge();
-
-    ManualRunDialog dialog(optionsWidget, project);
+    ManualRunDialog dialog(project);
     if (dialog.exec() == ManualRunDialog::Rejected)
         return;