diff --git a/apps/desktop/src-tauri/src/main.rs b/apps/desktop/src-tauri/src/main.rs
index 3d41bb628d..99a3920ab5 100644
--- a/apps/desktop/src-tauri/src/main.rs
+++ b/apps/desktop/src-tauri/src/main.rs
@@ -42,12 +42,28 @@ fn main() {
         .setup(backend::initialize)
         .invoke_handler(tauri::generate_handler![
             show_folder_in_finder,
+            show_main_window,
             backend::get_last_log_file,
         ])
         .run(tauri::generate_context!())
         .expect("error running tauri application");
 }
 
+#[tauri::command]
+fn show_main_window(app_handle: tauri::AppHandle) {
+    match app_handle.get_window("main") {
+        Some(window) => {
+            if !cfg!(target_os = "macos") {
+                window.unminimize().unwrap();
+            }
+            window.unminimize().unwrap();
+            window.set_focus().unwrap();
+            window.show().unwrap();
+        }
+        None => {}
+    }
+}
+
 #[tauri::command]
 fn show_folder_in_finder(path: String) {
     let path = PathBuf::from(path).canonicalize().unwrap();
diff --git a/client/src/pages/Onboarding/Desktop/UserForm/Step2.tsx b/client/src/pages/Onboarding/Desktop/UserForm/Step2.tsx
index d518fb441a..3a86e14e86 100644
--- a/client/src/pages/Onboarding/Desktop/UserForm/Step2.tsx
+++ b/client/src/pages/Onboarding/Desktop/UserForm/Step2.tsx
@@ -24,7 +24,8 @@ const UserFormStep2 = ({ onContinue }: Props) => {
   const { isGithubConnected, setGithubConnected } = useContext(
     UIContext.GitHubConnected,
   );
-  const { envConfig, openLink, setEnvConfig } = useContext(DeviceContext);
+  const { envConfig, openLink, setEnvConfig, invokeTauriCommand } =
+    useContext(DeviceContext);
   const [isTimedOut, setIsTimedOut] = useState(false);
   const [isBtnClicked, setBtnClicked] = useState(false);
   const [loginUrl, setLoginUrl] = useState('');
@@ -84,6 +85,7 @@ const UserFormStep2 = ({ onContinue }: Props) => {
         () =>
           checkGHAuth().then((d) => {
             if (!!d.user_login) {
+              invokeTauriCommand('show_main_window');
               onContinue();
             }
           }),