diff --git a/main/tray.js b/main/tray.js
index 92454d91..fa81f951 100644
--- a/main/tray.js
+++ b/main/tray.js
@@ -79,4 +79,5 @@ function showApp () {
 
 function hideApp () {
   windows.main.hide()
+  windows.main.send('dispatch', 'backToList')
 }
diff --git a/main/windows.js b/main/windows.js
index 9326c5e4..00da884b 100644
--- a/main/windows.js
+++ b/main/windows.js
@@ -114,13 +114,10 @@ function createMainWindow () {
     } else if (!electron.app.isQuitting) {
       e.preventDefault()
       win.hide()
+      win.send('dispatch', 'backToList')
     }
   })
 
-  win.on('hide', function () {
-    win.send('dispatch', 'backToList')
-  })
-
   win.once('closed', function () {
     windows.main = null
   })