diff --git a/src/sections/dataset/publish-dataset/PublishDatasetModal.tsx b/src/sections/dataset/publish-dataset/PublishDatasetModal.tsx
index 88bbb6d85..5f76bdca6 100644
--- a/src/sections/dataset/publish-dataset/PublishDatasetModal.tsx
+++ b/src/sections/dataset/publish-dataset/PublishDatasetModal.tsx
@@ -97,8 +97,10 @@ export function PublishDatasetModal({
         <Button
           variant="primary"
           onClick={() => {
-            handleClose()
             submitPublish(selectedVersionUpdateType)
+            if (submissionStatus === SubmissionStatus.SubmitComplete) {
+              handleClose()
+            }
           }}
           type="submit">
           {t('publish.continueButton')}