diff --git a/modules/session/Content.qml b/modules/session/Content.qml
index d6cacd6c..7c69bbde 100644
--- a/modules/session/Content.qml
+++ b/modules/session/Content.qml
@@ -23,7 +23,7 @@ Column {
         id: logout
 
         icon: "logout"
-        command: ["sh", "-c", "uwsm stop || loginctl terminate-session $XDG_SESSION_ID"]
+        command: ["sh", "-c", "(uwsm stop | grep -q 'Compositor is not running' && loginctl terminate-user $USER) || uwsm stop"]
 
         KeyNavigation.down: shutdown