diff --git a/libdino/src/application.vala b/libdino/src/application.vala
index da098fb4..55bf950c 100644
--- a/libdino/src/application.vala
+++ b/libdino/src/application.vala
@@ -111,10 +111,12 @@ public interface Dino.Application : GLib.Application {
     }
 
     protected void add_connection(Account account) {
+        if ((get_flags() & ApplicationFlags.IS_SERVICE) == ApplicationFlags.IS_SERVICE) hold();
         stream_interactor.connect_account(account);
     }
 
     protected void remove_connection(Account account) {
+        if ((get_flags() & ApplicationFlags.IS_SERVICE) == ApplicationFlags.IS_SERVICE) release();
         stream_interactor.disconnect_account(account);
     }
 
diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala
index df937a50..d9377aeb 100644
--- a/main/src/ui/application.vala
+++ b/main/src/ui/application.vala
@@ -32,6 +32,7 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application {
                 controller = new UnifiedWindowController(this, stream_interactor, db);
                 window = new UnifiedWindow(this, stream_interactor, db);
                 controller.set_window(window);
+                if ((get_flags() & ApplicationFlags.IS_SERVICE) == ApplicationFlags.IS_SERVICE) window.delete_event.connect(window.hide_on_delete);
 
                 notifications = new Notifications(stream_interactor, window);
                 notifications.start();