diff --git a/js/ui/components/autorunManager.js b/js/ui/components/autorunManager.js
index 38f93bc8c..541c75ca7 100644
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@@ -284,6 +284,10 @@ const AutorunResidentSource = new Lang.Class({
         this._notification = new AutorunResidentNotification(this._manager, this);
     },
 
+    buildRightClickMenu: function() {
+        return null;
+    },
+
     addMount: function(mount, apps) {
         if (!shouldAutorunMount(mount, false))
             return;
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index fc39e661b..f5fdeb447 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -2340,7 +2340,9 @@ const MessageTray = new Lang.Class({
                                                                                       Lang.bind(this, this._onSummaryBoxPointerContentUpdated));
         this._sourceDoneDisplayingId = this._summaryBoxPointerItem.source.connect('done-displaying-content',
                                                                                   Lang.bind(this, this._escapeTray));
-        if (this._clickedSummaryItemMouseButton == 1) {
+
+        let hasRightClickMenu = this._summaryBoxPointerItem.rightClickMenu != null;
+        if (this._clickedSummaryItemMouseButton == 1 || !hasRightClickMenu) {
             let newQueue = [];
             for (let i = 0; i < this._notificationQueue.length; i++) {
                 let notification = this._notificationQueue[i];