diff --git a/modules/dashboard/dash/Calendar.qml b/modules/dashboard/dash/Calendar.qml
index 7b69f986..aacea8ff 100644
--- a/modules/dashboard/dash/Calendar.qml
+++ b/modules/dashboard/dash/Calendar.qml
@@ -1,3 +1,5 @@
+pragma ComponentBehavior: Bound
+
 import "root:/widgets"
 import "root:/services"
 import "root:/config"
diff --git a/modules/session/Content.qml b/modules/session/Content.qml
index 4f4747c0..d6cacd6c 100644
--- a/modules/session/Content.qml
+++ b/modules/session/Content.qml
@@ -23,7 +23,7 @@ Column {
         id: logout
 
         icon: "logout"
-        command: ["uwsm", "stop"]
+        command: ["sh", "-c", "uwsm stop || loginctl terminate-session $XDG_SESSION_ID"]
 
         KeyNavigation.down: shutdown