diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 47b771c89..c688d850e 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -756,6 +756,7 @@ define([
             friendsList
         ]);
         var linkButtons = [{
+            className: 'cancel',
             name: Messages.cancel,
             onClick: function () {},
             keys: [27]
diff --git a/www/common/notifications.js b/www/common/notifications.js
index 6d75c31c7..136117c6f 100644
--- a/www/common/notifications.js
+++ b/www/common/notifications.js
@@ -20,9 +20,9 @@ define([
         common.addFriendRequest(data);
 
         // Display the notification
-        $(el).find('.cp-notification-content').addClass("cp-clickable");
         $(el).find('.cp-notification-content p')
-            .html(Messages._getKey('friendRequest_notification', [msg.content.displayName || Messages.anonymous]))
+            .html(Messages._getKey('friendRequest_notification', [msg.content.displayName || Messages.anonymous]));
+        $(el).find('.cp-notification-content').addClass("cp-clickable")
             .click(function () {
                 UIElements.displayFriendRequestModal(common, data);
             });
@@ -49,13 +49,13 @@ define([
     handlers['SHARE_PAD'] = function (common, data, el) {
         var content = data.content;
         var msg = content.msg;
-        $(el).find('.cp-notification-content').addClass("cp-clickable");
         var type = Hash.parsePadUrl(msg.content.href).type;
         var key = type === 'drive' ? 'notification_folderShared' :
                     (type === 'file' ? 'notification_fileShared' :
                       'notification_padShared');
         $(el).find('.cp-notification-content p')
-            .html(Messages._getKey(key, [msg.content.name || Messages.anonymous, msg.content.title]))
+            .html(Messages._getKey(key, [msg.content.name || Messages.anonymous, msg.content.title]));
+        $(el).find('.cp-notification-content').addClass("cp-clickable")
             .click(function () {
                 common.openURL(msg.content.href);
             });