diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index f87d7cf5..6b464716 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -13,6 +13,17 @@ public class Monitor.MainWindow : Gtk.ApplicationWindow {
     construct {
         title = _("Monitor");
 
+        close_request.connect (() => {
+            if (MonitorApp.settings.get_boolean ("indicator-state")) {
+                debug ("Indicator is enabled, hiding the window instead of closing");
+                hide ();
+                return Gdk.EVENT_STOP;
+            }
+            debug ("Close the window");
+            return Gdk.EVENT_PROPAGATE;
+        });
+
+
         var resources = new Resources ();
 
         process_view = new ProcessView ();