diff --git a/.config/ags/modules/.commonwidgets/notification.js b/.config/ags/modules/.commonwidgets/notification.js
index 7a8b4936c..52e9146a2 100644
--- a/.config/ags/modules/.commonwidgets/notification.js
+++ b/.config/ags/modules/.commonwidgets/notification.js
@@ -453,7 +453,7 @@ export default ({
                     }, wholeThing);
                 }
                 else {
-                    self.setCss(`transition: margin 200ms cubic-bezier(0.05, 0.7, 0.1, 1), opacity 200ms cubic-bezier(0.05, 0.7, 0.1, 1);
+                    self.setCss(`transition: ${userOptions.animations.durationSmall}ms cubic-bezier(0.05, 0.7, 0.1, 1), opacity ${userOptions.animations.durationSmall}ms cubic-bezier(0.05, 0.7, 0.1, 1);
                                    margin-left:  ${startMargin}px;
                                    margin-right: ${startMargin}px;
                                    margin-bottom: unset; margin-top: unset;
diff --git a/.config/ags/modules/sideright/centermodules/notificationlist.js b/.config/ags/modules/sideright/centermodules/notificationlist.js
index c13633d60..48e94a24b 100644
--- a/.config/ags/modules/sideright/centermodules/notificationlist.js
+++ b/.config/ags/modules/sideright/centermodules/notificationlist.js
@@ -10,6 +10,9 @@ import Notification from '../../.commonwidgets/notification.js';
 import { ConfigToggle } from '../../.commonwidgets/configwidgets.js';
 
 export default (props) => {
+    let previousLength;
+    let clearing = false;
+
     const notifEmptyContent = Box({
         homogeneous: true,
         children: [Box({
@@ -86,15 +89,6 @@ export default (props) => {
         Notifications.dnd = !Notifications.dnd;
         self.toggleClassName('notif-listaction-btn-enabled', Notifications.dnd);
     });
-    // const silenceToggle = ConfigToggle({
-    //     expandWidget: false,
-    //     icon: 'do_not_disturb_on',
-    //     name: 'Do Not Disturb',
-    //     initValue: false,
-    //     onChange: (self, newValue) => {
-    //         Notifications.dnd = newValue;
-    //     },
-    // })
     const clearButton = Revealer({
         transition: 'slide_right',
         transitionDuration: userOptions.animations.durationSmall,
@@ -102,6 +96,7 @@ export default (props) => {
             self.revealChild = Notifications.notifications.length > 0;
         }),
         child: ListActionButton('clear_all', getString('Clear'), () => {
+            clearing = true;
             Notifications.clear();
             const kids = notificationList.get_children();
             for (let i = 0; i < kids.length; i++) {
@@ -134,8 +129,6 @@ export default (props) => {
         children: [
             notifCount,
             silenceButton,
-            // silenceToggle,
-            // Box({ hexpand: true }),
             clearButton,
         ]
     });
@@ -160,9 +153,21 @@ export default (props) => {
             'empty': notifEmptyContent,
             'list': notifList,
         },
-        setup: (self) => self.hook(Notifications, (self) => {
-            self.shown = (Notifications.notifications.length > 0 ? 'list' : 'empty')
-        }),
+        setup: (self) => {
+            previousLength = Notifications.notifications.length;
+            self.hook(Notifications, (self) => {
+                if (Notifications.notifications.length > 0) {
+                    self.shown = 'list';
+                    if (!clearing) previousLength = Notifications.notifications.length;
+                }
+                else {
+                    Utils.timeout(userOptions.animations.choreographyDelay * previousLength, () => {
+                        clearing = false;
+                        if (Notifications.notifications.length == 0) self.shown = 'empty';
+                    })
+                }
+            })
+        },
     });
     return Box({
         ...props,