diff --git a/src/ProjectFileIO.cpp b/src/ProjectFileIO.cpp
index 376bf4dc3..143495c43 100644
--- a/src/ProjectFileIO.cpp
+++ b/src/ProjectFileIO.cpp
@@ -2060,6 +2060,8 @@ bool ProjectFileIO::SaveProject(
                reopened = true;
             else {
                MoveProject(fileName, savedName);
+               moved = false; // No longer moved
+
                reopened = OpenConnection(savedName);
             }
          }
@@ -2069,7 +2071,12 @@ bool ProjectFileIO::SaveProject(
             reopened = OpenConnection(savedName);
          }
 
-         if (!reopened)
+         // Warning issued in MoveProject()
+         if (reopened && !moved) {
+            return false;
+         }
+
+         if (!reopened) {
             wxTheApp->CallAfter([this]{
                ShowErrorDialog(nullptr,
                   XO("Warning"),
@@ -2082,8 +2089,8 @@ bool ProjectFileIO::SaveProject(
                mProject.ProcessEvent(evt);
             });
 
-         if (!moved)
             return false;
+         }
       }
    }
 
diff --git a/src/ProjectFileManager.cpp b/src/ProjectFileManager.cpp
index 37ed11fdc..421e588ff 100644
--- a/src/ProjectFileManager.cpp
+++ b/src/ProjectFileManager.cpp
@@ -317,7 +317,7 @@ bool ProjectFileManager::DoSave(const FilePath & fileName, const bool fromSaveAs
    if (!success)
    {
       // Show this error only if we didn't fail reconnection in SaveProject
-      if (projectFileIO.HasConnection())
+      if (!projectFileIO.HasConnection())
          ShowErrorDialog(
             &window,
             XO("Error Saving Project"),