diff --git a/src-tauri/src/core/setup.rs b/src-tauri/src/core/setup.rs
index 1bea0809b..2ca93b999 100644
--- a/src-tauri/src/core/setup.rs
+++ b/src-tauri/src/core/setup.rs
@@ -219,7 +219,6 @@ pub fn setup_tray(app: &App) -> tauri::Result<TrayIcon> {
     TrayIconBuilder::with_id("tray")
         .icon(app.default_window_icon().unwrap().clone())
         .menu(&menu)
-        .show_menu_on_left_click(true)
         .on_tray_icon_event(|tray, event| match event {
             TrayIconEvent::Click {
                 button: MouseButton::Left,
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 777b3aa91..59b1db5c0 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -112,7 +112,7 @@ pub fn run() {
         })
         .on_window_event(|window, event| match event {
             tauri::WindowEvent::CloseRequested { api, .. } => {
-                if env!("ENABLE_SYSTEM_TRAY_ICON") == "true" {
+                if option_env!("ENABLE_SYSTEM_TRAY_ICON").unwrap_or("false") == "true" {
                     #[cfg(target_os = "macos")]
                     window
                         .app_handle()
@@ -146,7 +146,7 @@ pub fn run() {
                 log::error!("Failed to install extensions: {}", e);
             }
 
-            if env!("ENABLE_SYSTEM_TRAY_ICON") == "true" {
+            if option_env!("ENABLE_SYSTEM_TRAY_ICON").unwrap_or("false") == "true" {
                 log::info!("Enabling system tray icon");
                 let _ = setup_tray(app);
             }