diff --git a/app/index.js b/app/index.js
index fb6b4f4..0f4618f 100644
--- a/app/index.js
+++ b/app/index.js
@@ -34,10 +34,11 @@ if (isAlreadyRunning) {
 }
 
 function toggleWindow() {
-  if (mainWindow.isVisible()) {
-    mainWindow.hide()
+  if (mainWindow.isFocused()) {
+    Menu.sendActionToFirstResponder('hide:')
   } else {
     mainWindow.show()
+    mainWindow.focus()
   }
 }