diff --git a/modules/bar.tsx b/modules/bar.tsx
index b7ffb56b..bf1bb9fd 100644
--- a/modules/bar.tsx
+++ b/modules/bar.tsx
@@ -259,7 +259,7 @@ const Power = () => (
 
 export default ({ monitor }: { monitor: AstalHyprland.Monitor }) => (
     <window
-        namespace="bar"
+        namespace="caelestia-bar"
         monitor={monitor.id}
         anchor={Astal.WindowAnchor.TOP}
         exclusivity={Astal.Exclusivity.EXCLUSIVE}
diff --git a/modules/notifpopups.tsx b/modules/notifpopups.tsx
index b4cb899d..f83d9dec 100644
--- a/modules/notifpopups.tsx
+++ b/modules/notifpopups.tsx
@@ -93,15 +93,16 @@ class NotifPopup extends Widget.Box {
             this.css = `transition: 150ms cubic-bezier(0.05, 0.9, 0.1, 1.1); margin-left: 0; margin-right: 0;`;
         });
 
-        // Close popup after timeout
-        // timeout(
-        //     notification.expireTimeout > 0
-        //         ? notification.expireTimeout
-        //         : notification.urgency === AstalNotifd.Urgency.CRITICAL
-        //         ? 10000
-        //         : 5000,
-        //     () => this.destroyWithAnims()
-        // );
+        // Close popup after timeout if transient
+        if (notification.transient)
+            timeout(
+                notification.expireTimeout > 0
+                    ? notification.expireTimeout
+                    : notification.urgency === AstalNotifd.Urgency.CRITICAL
+                    ? 10000
+                    : 5000,
+                () => this.destroyWithAnims()
+            );
     }
 
     destroyWithAnims() {
@@ -121,7 +122,7 @@ class NotifPopup extends Widget.Box {
 
 export default () => (
     <window
-        namespace="notifpopups"
+        namespace="caelestia-notifpopups"
         anchor={Astal.WindowAnchor.TOP | Astal.WindowAnchor.RIGHT | Astal.WindowAnchor.BOTTOM}
     >
         <box