diff --git a/packages/messages/src/browser/notification-component.tsx b/packages/messages/src/browser/notification-component.tsx
index efc358cc823b9..1e5341a2b0105 100644
--- a/packages/messages/src/browser/notification-component.tsx
+++ b/packages/messages/src/browser/notification-component.tsx
@@ -53,7 +53,6 @@ export class NotificationComponent extends React.Component<NotificationComponent
             const action = event.target.dataset.action;
             if (messageId && action) {
                 this.props.manager.accept(messageId, action);
-                this.props.manager.toggleExpansion(messageId);
             }
         }
     }
diff --git a/packages/messages/src/browser/notifications-manager.ts b/packages/messages/src/browser/notifications-manager.ts
index cd0d6429cab14..59eda20b514d8 100644
--- a/packages/messages/src/browser/notifications-manager.ts
+++ b/packages/messages/src/browser/notifications-manager.ts
@@ -121,6 +121,9 @@ export class NotificationManager extends MessageClient {
             return;
         }
         this.deferredResults.delete(messageId);
+        if (this.centerVisible && this.notifications.size === 0) {
+            this.visibilityState = 'hidden';
+        }
         result.resolve(action);
         this.fireUpdatedEvent();
     }