diff --git a/electron/indicator.js b/electron/indicator.js
index 8c8712b9cac..78c020183ab 100644
--- a/electron/indicator.js
+++ b/electron/indicator.js
@@ -22,7 +22,7 @@ function init(params) {
   initListeners(isGnomeShellExtensionInstalled);
 
   // if we have the gnome shell extension installed set up bus
-  if (isGnomeShellExtensionInstalled) {
+  if (IS_GNOME && isGnomeShellExtensionInstalled) {
     dbus.init({
       mainWin,
       quitApp,
diff --git a/electron/main-window.js b/electron/main-window.js
index 1a3885c6706..0be7a2d948e 100644
--- a/electron/main-window.js
+++ b/electron/main-window.js
@@ -75,6 +75,9 @@ function initWinEventListeners(app, IS_MAC, nestedWinParams) {
       if (!app.isQuiting && indicatorMod.isRunning()) {
         event.preventDefault();
         mainWin.hide();
+      } else {
+        // just quit (NOTE: normally this shouldn't be necessary)
+        app.quit();
       }
     }
   });