diff --git a/browser/finder/index.js b/browser/finder/index.js
index 99d7ddb2..1f4d1121 100644
--- a/browser/finder/index.js
+++ b/browser/finder/index.js
@@ -15,11 +15,12 @@ const { remote } = electron
 const { Menu } = remote
 
 function hideFinder () {
-  if (process.platform === 'win32') {
-    remote.getCurrentWindow().minimize()
-    return
+  let finderWindow = remote.getCurrentWindow()
+  if (global.process.platform === 'win32') {
+    finderWindow.blur()
+    finderWindow.hide()
   }
-  if (process.platform === 'darwin') {
+  if (global.process.platform === 'darwin') {
     Menu.sendActionToFirstResponder('hide:')
   }
   remote.getCurrentWindow().hide()
@@ -48,6 +49,7 @@ class FinderMain extends React.Component {
   }
 
   componentDidMount () {
+    this.refs.search.focus()
     window.addEventListener('focus', this.focusHandler)
     window.addEventListener('blur', this.blurHandler)
   }
diff --git a/browser/finder/ipcClient.js b/browser/finder/ipcClient.js
index 55bcf049..27610043 100644
--- a/browser/finder/ipcClient.js
+++ b/browser/finder/ipcClient.js
@@ -30,12 +30,21 @@ function toggleFinder () {
       finderWindow.show()
     }
   } else {
-    if (!finderWindow.isMinimized()) {
-      finderWindow.minimize()
+    if (finderWindow.isVisible()) {
+      finderWindow.blur()
+      finderWindow.hide()
     } else {
       nodeIpc.of.node.emit('request-data')
-      finderWindow.restore()
+      finderWindow.show()
+      finderWindow.focus()
     }
+    // if (!finderWindow.isMinimized()) {
+    //   finderWindow.minimize()
+    // } else {
+    //   nodeIpc.of.node.emit('request-data')
+    //   finderWindow.restore()
+    //   finderWindow.focus()
+    // }
   }
 }