diff --git a/src/main.js b/src/main.js
index 1d5aaf3f..2d765c55 100644
--- a/src/main.js
+++ b/src/main.js
@@ -160,7 +160,6 @@ app.on('browser-window-created', function(event, window) {
 // For OSX, show hidden mainWindow when clicking dock icon.
 app.on('activate', function(event) {
   mainWindow.show();
-  mainWindow.isHidden = false;
 });
 
 app.on('before-quit', function() {
@@ -233,9 +232,8 @@ app.on('ready', function() {
     trayIcon.setToolTip(app.getName());
     trayIcon.on('click', function() {
       if (process.platform === 'win32' || process.platform === 'linux') {
-        if (mainWindow.isHidden || mainWindow.isMinimized()) {
+        if (!mainWindow.isVisible() || mainWindow.isMinimized()) {
           mainWindow.show();
-          mainWindow.isHidden = false;
           mainWindow.focus();
         }
         else if (config.toggleWindowOnTrayIconClick) {
@@ -246,9 +244,8 @@ app.on('ready', function() {
         }
       }
       else if (process.platform === 'darwin') {
-        if (mainWindow.isHidden || mainWindow.isMinimized()) {
+        if (!mainWindow.isVisible() || mainWindow.isMinimized()) {
           mainWindow.show();
-          mainWindow.isHidden = false;
           mainWindow.focus();
           app.dock.show();
         }
@@ -256,9 +253,6 @@ app.on('ready', function() {
           mainWindow.focus();
         }
       }
-      else {
-        mainWindow.focus();
-      }
     });
 
     trayIcon.on('right-click', () => {
@@ -267,7 +261,6 @@ app.on('ready', function() {
     trayIcon.on('balloon-click', function() {
       if (process.platform === 'win32' || process.platform === 'darwin') {
         mainWindow.show();
-        mainWindow.isHidden = false;
       }
 
       if (process.platform === 'darwin') {
@@ -404,12 +397,10 @@ app.on('ready', function() {
       switch (process.platform) {
         case 'win32':
           mainWindow.hide();
-          mainWindow.isHidden = true;
           break;
         case 'linux':
           if (config.minimizeToTray) {
             mainWindow.hide();
-            mainWindow.isHidden = true;
           }
           else {
             mainWindow.minimize();
@@ -419,7 +410,6 @@ app.on('ready', function() {
           mainWindow.hide();
           if (config.minimizeToTray) {
             app.dock.hide();
-            mainWindow.isHidden = true;
           }
           break;
         default:
diff --git a/src/main/menus/tray.js b/src/main/menus/tray.js
index 0e41b08e..93431e98 100644
--- a/src/main/menus/tray.js
+++ b/src/main/menus/tray.js
@@ -15,7 +15,6 @@ function createTemplate(mainWindow, config) {
         click: (item, focusedWindow) => {
           mainWindow.show(); // for OS X
           mainWindow.webContents.send('switch-tab', i);
-          mainWindow.isHidden = false;
 
           if (process.platform === 'darwin') {
             app.dock.show();