diff --git a/src/apps/desktop/src/lib.rs b/src/apps/desktop/src/lib.rs
index f73fe00b..2c524d90 100644
--- a/src/apps/desktop/src/lib.rs
+++ b/src/apps/desktop/src/lib.rs
@@ -133,30 +133,6 @@ pub async fn run() {
         .plugin(tauri_plugin_opener::init())
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_fs::init())
-        .on_menu_event(|app, event| {
-            #[cfg(target_os = "macos")]
-            {
-                let event_name = if event.id() == "bitfun.open_project" {
-                    Some("bitfun_menu_open_project")
-                } else if event.id() == "bitfun.new_project" {
-                    Some("bitfun_menu_new_project")
-                } else if event.id() == "bitfun.about" {
-                    Some("bitfun_menu_about")
-                } else {
-                    None
-                };
-
-                if let Some(event_name) = event_name {
-                    // App-wide emit: delivers to frontend listeners even if window is not ready or label changed
-                    let _ = app.emit(event_name, ());
-                }
-            }
-
-            #[cfg(not(target_os = "macos"))]
-            {
-                let _ = (app, event);
-            }
-        })
         .manage(app_state)
         .manage(coordinator_state)
         .manage(scheduler_state)
@@ -165,6 +141,25 @@ pub async fn run() {
         .manage(scheduler)
         .manage(terminal_state)
         .setup(move |app| {
+            #[cfg(target_os = "macos")]
+            {
+                app.on_menu_event(|app, event| {
+                    let event_name = if event.id() == "bitfun.open_project" {
+                        Some("bitfun_menu_open_project")
+                    } else if event.id() == "bitfun.new_project" {
+                        Some("bitfun_menu_new_project")
+                    } else if event.id() == "bitfun.about" {
+                        Some("bitfun_menu_about")
+                    } else {
+                        None
+                    };
+
+                    if let Some(event_name) = event_name {
+                        let _ = app.emit(event_name, ());
+                    }
+                });
+            }
+
             logging::register_runtime_log_state(startup_log_level, session_log_dir.clone());
 
             // Register bundled mobile-web resource path for remote connect.
diff --git a/src/apps/desktop/src/theme.rs b/src/apps/desktop/src/theme.rs
index 4f27ce8c..d3d4aca5 100644
--- a/src/apps/desktop/src/theme.rs
+++ b/src/apps/desktop/src/theme.rs
@@ -242,7 +242,8 @@ pub fn create_main_window(app_handle: &tauri::AppHandle) {
         .visible(false)
         .background_color(bg_color)
         .accept_first_mouse(true)
-        .initialization_script(&init_script);
+        .initialization_script(&init_script)
+        .disable_drag_drop_handler();
 
     #[cfg(target_os = "macos")]
     {
@@ -253,16 +254,6 @@ pub fn create_main_window(app_handle: &tauri::AppHandle) {
             .hidden_title(true);
     }
 
-    #[cfg(not(target_os = "macos"))]
-    {
-        builder = builder.decorations(false);
-    }
-
-    #[cfg(target_os = "windows")]
-    {
-        builder = builder.disable_drag_drop_handler();
-    }
-
     match builder.build() {
         Ok(window) => {
             #[cfg(debug_assertions)]