diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 42aaf46d..eb397b20 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -97,15 +97,6 @@ public class Monitor.MainWindow : Hdy.ApplicationWindow {
             });
         });
 
-
-        dbusserver.quit.connect (() => application.quit ());
-        dbusserver.show.connect (() => {
-            this.deiconify ();
-            this.present ();
-            setup_window_state ();
-            this.show_all ();
-        });
-
         key_press_event.connect (search_entry.handle_event);
 
         this.delete_event.connect (() => {
@@ -115,7 +106,6 @@ public class Monitor.MainWindow : Hdy.ApplicationWindow {
             MonitorApp.settings.set_int ("window-height", window_height);
             MonitorApp.settings.set_boolean ("is-maximized", this.is_maximized);
 
-
             if (MonitorApp.settings.get_boolean ("indicator-state")) {
                 this.hide_on_delete ();
             } else {
diff --git a/src/Monitor.vala b/src/Monitor.vala
index dc80381c..813cfb41 100644
--- a/src/Monitor.vala
+++ b/src/Monitor.vala
@@ -53,6 +53,10 @@ namespace Monitor {
             set_accels_for_action ("win.search", { "<Ctrl>f" });
             set_accels_for_action ("process.end", { "<Ctrl>e" });
             set_accels_for_action ("process.kill", { "<Ctrl>k" });
+
+            var dbusserver = DBusServer.get_default ();
+            dbusserver.show.connect (() => activate ());
+            dbusserver.quit.connect (quit);
         }
 
         public override void activate () {