diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index f56cfe9..82de9ea 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -25,9 +25,16 @@ pub fn run() {
                         button_state: MouseButtonState::Up,
                         ..
                     } => {
-                        icon.app_handle()
-                            .get_window("main").unwrap()
-                            .show().unwrap();
+                        let window = icon.app_handle().get_window("main").unwrap();
+                        if !window.is_visible().unwrap() {
+                            window.show().unwrap();
+                        }
+                        if window.is_minimized().unwrap() {
+                            window.unminimize().unwrap();
+                        }
+                        if !window.is_focused().unwrap() {
+                            window.set_focus().unwrap();
+                        }
                         println!("Tray icon clicked");
                     }
                     _ => {}
@@ -36,13 +43,13 @@ pub fn run() {
                 .menu_on_left_click(false)
                 .on_menu_event(|app, event| match event.id.as_ref() {
                     "quit" => {
-                      println!("quit menu item was clicked");
-                      app.exit(0);
+                        println!("quit menu item was clicked");
+                        app.exit(0);
                     }
                     _ => {
-                      println!("menu item {:?} not handled", event.id);
+                        println!("menu item {:?} not handled", event.id);
                     }
-                  })
+                })
                 .build(app)?;
             Ok(())
         })