diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 031552c0d..234ca6bb1 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -789,6 +789,8 @@ Settings MainWindow::GetCppcheckSettings()
         result.jobs = 1;
     }
 
+    result.terminate(false);
+
     return result;
 }
 
@@ -1375,7 +1377,8 @@ void MainWindow::EditProjectFile()
         msg.exec();
         return;
     }
-    mProject->Edit();
+    if (mProject->Edit())
+        CheckProject(mProject);
 }
 
 void MainWindow::ShowLogView()
diff --git a/lib/settings.h b/lib/settings.h
index 9be0d4d9f..38407d89a 100644
--- a/lib/settings.h
+++ b/lib/settings.h
@@ -97,8 +97,8 @@ public:
     bool verbose;
 
     /** @brief Request termination of checking */
-    void terminate() {
-        Settings::_terminated = true;
+    void terminate(bool t = true) {
+        Settings::_terminated = t;
     }
 
     /** @brief termination requested? */