diff --git a/src/UI/UIWindow2FASetup.js b/src/UI/UIWindow2FASetup.js
index 7bfe22bc8..f14123f39 100644
--- a/src/UI/UIWindow2FASetup.js
+++ b/src/UI/UIWindow2FASetup.js
@@ -176,9 +176,12 @@ const UIWindow2FASetup = async function UIWindow2FASetup () {
 
     win = await UIComponentWindow({
         component,
-        // on_before_exit: async () => {
-        //     return true;
-        // },
+        on_before_exit: async () => {
+            if ( ! stepper.get('done') ) {
+                promise.resolve(false);
+            }
+            return true
+        },
 
         title: '2FA Setup',
         app: 'instant-login',