From 2cabb092487d294dcfc7b64a8dc376a28f43a778 Mon Sep 17 00:00:00 2001
From: Ashutosh Singh <ashutosh.singh1@jiostar.com>
Date: Fri, 6 Feb 2026 16:41:44 +0530
Subject: [PATCH] new window fix (#12371)

---
 src/electron/electron/handler.cljs      | 3 +--
 src/electron/electron/window.cljs       | 2 ++
 src/main/frontend/components/theme.cljs | 7 +------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/electron/electron/handler.cljs b/src/electron/electron/handler.cljs
index a20c0d8e5c..6d800b22b7 100644
--- a/src/electron/electron/handler.cljs
+++ b/src/electron/electron/handler.cljs
@@ -428,8 +428,7 @@
   (.close win))
 
 (defmethod handle :theme-loaded [^js win]
-  (.manage (windowStateKeeper) win)
-  (.show win))
+  (.manage (windowStateKeeper) win))
 
 (defmethod handle :keychain/save-e2ee-password [_window [_ key encrypted-text]]
   (keychain/<set-password! key encrypted-text))
diff --git a/src/electron/electron/window.cljs b/src/electron/electron/window.cljs
index a401a8e1a2..b5e656bc6d 100644
--- a/src/electron/electron/window.cljs
+++ b/src/electron/electron/window.cljs
@@ -67,6 +67,8 @@
                                (callback (bean/->js
                                           {:cancel         false
                                            :requestHeaders headers})))))
+     ;; Show window as soon as it's ready
+     (.once win "ready-to-show" #(.show win))
      (.loadURL win url)
      ;;(when dev? (.. win -webContents (openDevTools)))
      win)))
diff --git a/src/main/frontend/components/theme.cljs b/src/main/frontend/components/theme.cljs
index 8168390c25..89d33e2335 100644
--- a/src/main/frontend/components/theme.cljs
+++ b/src/main/frontend/components/theme.cljs
@@ -33,8 +33,6 @@
      {:ref   *el
       :class "top-1/2 -left-1/2 z-[-999]"}]))
 
-(defonce *once-theme-loaded? (volatile! false))
-
 (rum/defc ^:large-vars/cleanup-todo container < rum/static
   [{:keys [route theme accent-color editor-font on-click current-repo db-restoring?
            settings-open? sidebar-open? system-theme? sidebar-blocks-len preferred-language]} child]
@@ -76,10 +74,7 @@
      [preferred-language])
 
     (hooks/use-effect!
-     #(js/setTimeout
-       (fn [] (when-not @*once-theme-loaded?
-                (ipc/ipc :theme-loaded)
-                (vreset! *once-theme-loaded? true))) 100) ; Wait for the theme to be applied
+     #(ipc/ipc :theme-loaded)
      [])
 
     (hooks/use-effect!