diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 30ce5cc1c..40d5ee062 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -2495,6 +2495,9 @@ const MessageTray = new Lang.Class({
             this._summaryBoxPointer.actor.hide();
             this._hideSummaryBoxPointerCompleted();
         } else {
+            if (global.stage.key_focus &&
+                !this.actor.contains(global.stage.key_focus))
+                this._setClickedSummaryItem(null);
             this._summaryBoxPointer.hide(BoxPointer.PopupAnimation.FULL, Lang.bind(this, this._hideSummaryBoxPointerCompleted));
         }
     },