diff --git a/src/main.ts b/src/main.ts
index 242b7e4..3463ab3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -45,11 +45,15 @@ app.on('window-all-closed', () => {
 });
 
 app.on('activate', () => {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (BrowserWindow.getAllWindows().length === 0) {
+  if (!window || window.isDestroyed()) {
     createWindow();
   }
+
+  if (!tray) {
+    createTray();
+  }
+
+  showWindow();
 });
 
 // In this file you can include the rest of your app's specific main process