diff --git a/Baccarat/Baccarat/Views/Game/GameTableView.swift b/Baccarat/Baccarat/Views/Game/GameTableView.swift
index 5cc6b61..b55e545 100644
--- a/Baccarat/Baccarat/Views/Game/GameTableView.swift
+++ b/Baccarat/Baccarat/Views/Game/GameTableView.swift
@@ -164,12 +164,12 @@ struct GameTableView: View {
                     checkOnboardingHints()
                 },
                 onStartPlaying: {
-                    showWelcome = false
-                    state.onboarding.completeWelcome()
-                    // Mark all hints as shown so they don't appear
+                    // Mark all hints as shown FIRST so they don't appear
                     state.onboarding.markHintShown("bettingZone")
                     state.onboarding.markHintShown("dealButton")
                     state.onboarding.markHintShown("firstResult")
+                    state.onboarding.completeWelcome()
+                    showWelcome = false
                 }
             )
         }
diff --git a/Blackjack/Blackjack/Views/Game/GameTableView.swift b/Blackjack/Blackjack/Views/Game/GameTableView.swift
index d34d5a7..be51017 100644
--- a/Blackjack/Blackjack/Views/Game/GameTableView.swift
+++ b/Blackjack/Blackjack/Views/Game/GameTableView.swift
@@ -112,12 +112,12 @@ struct GameTableView: View {
                     checkOnboardingHints()
                 },
                 onStartPlaying: {
-                    showWelcome = false
-                    state.onboarding.completeWelcome()
-                    // Mark all hints as shown so they don't appear
+                    // Mark all hints as shown FIRST so they don't appear
                     state.onboarding.markHintShown("bettingZone")
                     state.onboarding.markHintShown("dealButton")
                     state.onboarding.markHintShown("playerActions")
+                    state.onboarding.completeWelcome()
+                    showWelcome = false
                 }
             )
         }