diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index f592f4849..f1244a5d0 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -108,12 +108,12 @@ URLHighlighter.prototype = {
         }
 
         this.setMarkup(text, allowMarkup);
-        this.actor.connect('button-press-event', function() {
+        this.actor.connect('button-press-event', Lang.bind(this, function(actor, event) {
             // Keep Notification.actor from seeing this and taking
             // a pointer grab, which would block our button-release-event
-            // handler
-            return true;
-        });
+            // handler, if an URL is clicked
+            return this._findUrlAtPos(event) != -1;
+        }));
         this.actor.connect('button-release-event', Lang.bind(this, function (actor, event) {
             let urlId = this._findUrlAtPos(event);
             if (urlId != -1) {