diff --git a/src/core_main.rs b/src/core_main.rs
index daa97ceb1..8c6430ef8 100644
--- a/src/core_main.rs
+++ b/src/core_main.rs
@@ -135,6 +135,9 @@ pub fn core_main() -> Option<Vec<String>> {
                 #[cfg(feature = "with_rc")]
                 hbb_common::allow_err!(crate::rc::extract_resources(&args[1]));
                 return None;
+            } else if args[0] == "--tray" {
+                crate::tray::start_tray(crate::ui_interface::OPTIONS.clone());
+                return None;
             }
         }
         if args[0] == "--remove" {
diff --git a/src/ui.rs b/src/ui.rs
index 548bfad43..c25aaf670 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -89,11 +89,6 @@ pub fn start(args: &mut [String]) {
     unsafe {
         winapi::um::shellscalingapi::SetProcessDpiAwareness(2);
     }
-    #[cfg(windows)]
-    if args.len() > 0 && args[0] == "--tray" {
-        crate::tray::start_tray(crate::ui_interface::OPTIONS.clone());
-        return;
-    }
     use sciter::SCRIPT_RUNTIME_FEATURES::*;
     allow_err!(sciter::set_options(sciter::RuntimeOptions::ScriptFeatures(
         ALLOW_FILE_IO as u8 | ALLOW_SOCKET_IO as u8 | ALLOW_EVAL as u8 | ALLOW_SYSINFO as u8