diff --git a/devices/wim/config/ags/js/notifications/gesture.js b/devices/wim/config/ags/js/notifications/gesture.js
index 26b84ec0..ee1a7545 100644
--- a/devices/wim/config/ags/js/notifications/gesture.js
+++ b/devices/wim/config/ags/js/notifications/gesture.js
@@ -46,15 +46,19 @@ export default ({
     const widget = EventBox({
         ...props,
         cursor: 'grab',
-        on_hover: (self) => {
-            if (!self.attribute.hovered) {
-                self.attribute.hovered = true;
-            }
-        },
-        on_hover_lost: (self) => {
-            if (self.attribute.hovered) {
-                self.attribute.hovered = false;
-            }
+
+        setup: (self) => {
+            self
+                .on('leave-notify-event', () => {
+                    if (self.attribute.hovered) {
+                        self.attribute.hovered = false;
+                    }
+                })
+                .on('enter-notify-event', () => {
+                    if (!self.attribute.hovered) {
+                        self.attribute.hovered = true;
+                    }
+                });
         },
 
         attribute: {
diff --git a/devices/wim/config/ags/js/notifications/popup.js b/devices/wim/config/ags/js/notifications/popup.js
index c287d59a..2395bed5 100644
--- a/devices/wim/config/ags/js/notifications/popup.js
+++ b/devices/wim/config/ags/js/notifications/popup.js
@@ -25,7 +25,11 @@ export default () => Box({
             if (notif) {
                 const NewNotif = Notification({
                     notif,
-                    command: () => notif.dismiss(),
+                    command: () => {
+                        if (notif.popup) {
+                            notif.dismiss();
+                        }
+                    },
                 });
 
                 if (NewNotif) {