diff --git a/novelwriter/tools/manusbuild.py b/novelwriter/tools/manusbuild.py
index 6f1b0d16..abbc51a6 100644
--- a/novelwriter/tools/manusbuild.py
+++ b/novelwriter/tools/manusbuild.py
@@ -65,6 +65,7 @@ class GuiManuscriptBuild(QDialog):
         logger.debug("Create: GuiManuscriptBuild")
         self.setObjectName("GuiManuscriptBuild")
 
+        self.guiParent  = parent
         self.mainGui    = mainGui
         self.mainTheme  = mainGui.mainTheme
         self.theProject = mainGui.theProject
@@ -249,6 +250,7 @@ class GuiManuscriptBuild(QDialog):
         """
         self._saveSettings()
         event.accept()
+        self.guiParent.raise_()  # Issue #1494
         self.deleteLater()
         return
 
@@ -276,6 +278,8 @@ class GuiManuscriptBuild(QDialog):
         )
         if savePath:
             self.buildPath.setText(savePath)
+        self.guiParent.raise_()  # Issue #1494
+        self.raise_()  # Issue #1494
         return
 
     @pyqtSlot()
diff --git a/novelwriter/tools/manussettings.py b/novelwriter/tools/manussettings.py
index c69eb679..e1ca2b05 100644
--- a/novelwriter/tools/manussettings.py
+++ b/novelwriter/tools/manussettings.py
@@ -209,10 +209,8 @@ class GuiBuildSettings(QDialog):
         elif role == QDialogButtonBox.AcceptRole:
             self._emitBuildData()
             self.close()
-            self.guiParent.raise_()  # Issue #1494
         elif role == QDialogButtonBox.RejectRole:
             self.close()
-            self.guiParent.raise_()  # Issue #1494
         return
 
     ##
@@ -227,6 +225,7 @@ class GuiBuildSettings(QDialog):
         self._askToSaveBuild()
         self._saveSettings()
         event.accept()
+        self.guiParent.raise_()  # Issue #1494
         self.deleteLater()
         return