diff --git a/phpmon/Domain/Menu/MainMenu+Startup.swift b/phpmon/Domain/Menu/MainMenu+Startup.swift
index dc5d183..93430dd 100644
--- a/phpmon/Domain/Menu/MainMenu+Startup.swift
+++ b/phpmon/Domain/Menu/MainMenu+Startup.swift
@@ -110,9 +110,9 @@ extension MainMenu {
                 Task { @MainActor in
                     OnboardingWindowController.show()
                 }
+            } else {
+                await AppUpdater().checkForUpdates(interactive: false)
             }
-
-            await AppUpdater().checkForUpdates(interactive: false)
         }
 
         // Check if the linked version has changed between launches of phpmon
diff --git a/phpmon/Domain/Onboarding/OnboardingWindowController.swift b/phpmon/Domain/Onboarding/OnboardingWindowController.swift
index 5b65200..3ac430b 100644
--- a/phpmon/Domain/Onboarding/OnboardingWindowController.swift
+++ b/phpmon/Domain/Onboarding/OnboardingWindowController.swift
@@ -42,4 +42,13 @@ class OnboardingWindowController: PMWindowController {
 
         NSApp.activate(ignoringOtherApps: true)
     }
+
+    override func close() {
+        super.close()
+
+        // Search for updates after closing the window
+        if Stats.successfulLaunchCount == 1 {
+            Task { await AppUpdater().checkForUpdates(interactive: false) }
+        }
+    }
 }