diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 09551dc9b..723f89a2e 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -565,6 +565,7 @@ const KeyboardSource = new Lang.Class({
     _init: function(keyboard) {
         this._keyboard = keyboard;
         this.parent(_("Keyboard"), 'input-keyboard-symbolic');
+        this.keepTrayOnSummaryClick = true;
     },
 
     handleSummaryClick: function() {
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 7f76b959d..55d8c37a5 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1052,6 +1052,7 @@ const Source = new Lang.Class({
         this.isChat = false;
         this.isMuted = false;
         this.showInLockScreen = true;
+        this.keepTrayOnSummaryClick = false;
 
         this.notifications = [];
     },
@@ -1776,7 +1777,10 @@ const MessageTray = new Lang.Class({
 
     _onSummaryItemClicked: function(summaryItem, button) {
         if (summaryItem.source.handleSummaryClick()) {
-            this._escapeTray();
+            if (summaryItem.source.keepTrayOnSummaryClick)
+                this._setClickedSummaryItem(null);
+            else
+                this._escapeTray();
         } else {
             if (!this._setClickedSummaryItem(summaryItem, button))
                 this._setClickedSummaryItem(null);