diff --git a/lib/finder-window.js b/lib/finder-window.js
index 2d546049..0ff59731 100644
--- a/lib/finder-window.js
+++ b/lib/finder-window.js
@@ -47,7 +47,13 @@ nodeIpc.connectTo(
       function (payload) {
         switch (payload.type) {
           case 'open-finder':
-            if (isFinderLoaded) openFinder()
+            if (isFinderLoaded) {
+              if (finderWindow.isFocused()) {
+                hideFinder()
+              } else {
+                openFinder()
+              }
+            }
             break
         }
       }