2 files changed, 6 insertions, 2 deletions

diff --git a/src/index.js b/src/index.js
index b297d66d8..af3172fb1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -114,7 +114,9 @@ if (!gotTheLock) {
   app.on('second-instance', (event, argv) => {
     // Someone tried to run a second instance, we should focus our window.
     if (mainWindow) {
-      mainWindow.show();
+      if (!mainWindow.isVisible()) {
+        mainWindow.show();
+      }
       if (mainWindow.isMinimized()) {
         mainWindow.restore();
       }
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 869cfa9d6..529201df5 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -333,7 +333,9 @@ export default class AppStore extends Store {
         this.actions.service.setActive({
           serviceId,
         });
-        mainWindow.show();
+        if (!app.mainWindow.isVisible()) {
+          mainWindow.show();
+        }
         if (app.mainWindow.isMinimized()) {
           mainWindow.restore();
         }