diff --git a/src/components/Flow.tsx b/src/components/Flow.tsx
index 427b2ae..3acd41a 100644
--- a/src/components/Flow.tsx
+++ b/src/components/Flow.tsx
@@ -2299,7 +2299,10 @@ function FlowContent() {
             onStartEmpty={handleWelcomeStartEmpty}
             onLoadExample={handleWelcomeLoadExample}
             hideStartEmpty={isMobileReadOnly}
-            onOpenChange={setShowWelcomeDialog}
+            onOpenChange={(open) => {
+              setShowWelcomeDialog(open);
+              if (!open) markWelcomeComplete();
+            }}
           />
         </div>
       </FlowActionsProvider>
diff --git a/src/components/dialog/FirstRunDialog.tsx b/src/components/dialog/FirstRunDialog.tsx
index 31ef6eb..291ec92 100644
--- a/src/components/dialog/FirstRunDialog.tsx
+++ b/src/components/dialog/FirstRunDialog.tsx
@@ -79,17 +79,7 @@ export function FirstRunDialog({
   };
 
   const handleOpenChange = (nextOpen: boolean) => {
-    if (nextOpen) {
-      onOpenChange?.(true);
-      return;
-    }
-    if (actionRef.current === null && !hideStartEmpty) {
-      actionRef.current = "empty";
-      onStartEmpty();
-      onOpenChange?.(false);
-      return;
-    }
-    onOpenChange?.(false);
+    onOpenChange?.(nextOpen);
   };
 
   const dialogDescription = hideStartEmpty