diff --git a/libdino/src/service/connection_manager.vala b/libdino/src/service/connection_manager.vala
index 4d1dbddf..a8c3b487 100644
--- a/libdino/src/service/connection_manager.vala
+++ b/libdino/src/service/connection_manager.vala
@@ -11,6 +11,7 @@ public class ConnectionManager : Object {
     public signal void stream_attached_modules(Account account, XmppStream stream);
     public signal void connection_state_changed(Account account, ConnectionState state);
     public signal void connection_error(Account account, ConnectionError error);
+    public signal void request_inhibit(bool suspend);
 
     public enum ConnectionState {
         CONNECTED,
@@ -368,6 +369,7 @@ public class ConnectionManager : Object {
             debug("Login1: Device un-suspend");
             check_reconnects();
         }
+        request_inhibit(false);
     }
 
     private void change_connection_state(Account account, ConnectionState state) {
diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala
index 6c02087f..047fd57e 100644
--- a/main/src/ui/application.vala
+++ b/main/src/ui/application.vala
@@ -20,6 +20,7 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application {
     public StreamInteractor stream_interactor { get; set; }
     public Plugins.Registry plugin_registry { get; set; default = new Plugins.Registry(); }
     public SearchPathGenerator? search_path_generator { get; set; }
+    private uint inhibit_cookie;
 
     internal static bool print_version = false;
     private const OptionEntry[] options = {
@@ -30,6 +31,22 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application {
     public Application() throws Error {
         Object(application_id: "im.dino.Dino", flags: ApplicationFlags.HANDLES_OPEN);
         init();
+
+        stream_interactor.connection_manager.request_inhibit.connect((do_inhibit) => {
+            debug(@"requested inhibit [%i]", do_inhibit);
+
+            if (do_inhibit) {
+                    inhibit_cookie = inhibit(window, SUSPEND, "Preparing for sleep");
+
+                if (inhibit_cookie == 0) {
+                    warning("suspend inhibit request failed or unsupported");
+                }
+            }
+            else if (inhibit_cookie != 0) {
+                uninhibit(inhibit_cookie);
+            }
+        });
+
         Environment.set_application_name("Dino");
         Window.set_default_icon_name("im.dino.Dino");