diff --git a/packages/editor/src/components/post-actions/set-as-homepage.js b/packages/editor/src/components/post-actions/set-as-homepage.js
index f3d53229cf35a..ad479b8f40dec 100644
--- a/packages/editor/src/components/post-actions/set-as-homepage.js
+++ b/packages/editor/src/components/post-actions/set-as-homepage.js
@@ -65,7 +65,6 @@ const SetAsHomepageModal = ( { items, closeModal } ) => {
 				show_on_front: 'page',
 			} );
 
-			closeModal?.();
 			createSuccessNotice( __( 'Homepage updated' ), {
 				type: 'snackbar',
 			} );
@@ -76,6 +75,8 @@ const SetAsHomepageModal = ( { items, closeModal } ) => {
 					? typedError.message
 					: __( 'An error occurred while setting the homepage' );
 			createErrorNotice( errorMessage, { type: 'snackbar' } );
+		} finally {
+			closeModal?.();
 		}
 	}