diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 5c4445810..d15bd62ce 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1157,7 +1157,7 @@ MessageTray.prototype = {
         if (index == -1)
             return;
 
-        this._summaryItems[index].actor.destroy();
+        let summaryItemToRemove = this._summaryItems[index];
 
         let newSummaryItemsIndex = this._newSummaryItems.indexOf(this._summaryItems[index]);
         if (newSummaryItemsIndex != -1)
@@ -1168,6 +1168,9 @@ MessageTray.prototype = {
         if (source.isChat)
             this._chatSummaryItemsCount--;
 
+        if (this._expandedSummaryItem == summaryItemToRemove)
+            this._expandedSummaryItem = null;
+
         if (this._longestSummaryItem.source == source) {
             let newTitleWidth = 0;
             this._longestSummaryItem = null;
@@ -1192,11 +1195,13 @@ MessageTray.prototype = {
             this._notificationRemoved = true;
             needUpdate = true;
         }
-        if (this._clickedSummaryItem && this._clickedSummaryItem.source == source) {
+        if (this._clickedSummaryItem == summaryItemToRemove) {
             this._unsetClickedSummaryItem();
             needUpdate = true;
         }
 
+        summaryItemToRemove.actor.destroy();
+
         if (needUpdate);
             this._updateState();