diff --git a/toolkit/components/alerts/resources/content/alert.js b/toolkit/components/alerts/resources/content/alert.js
index f283d9dbaa63..40d5ab806728 100644
--- a/toolkit/components/alerts/resources/content/alert.js
+++ b/toolkit/components/alerts/resources/content/alert.js
@@ -75,8 +75,10 @@ function prefillAlertInfo()
       gAlertCookie = window.arguments[4];
     case 4:
       gAlertTextClickable = window.arguments[3];
-      if (gAlertTextClickable)
+      if (gAlertTextClickable) {
+        document.getElementById('alertNotification').setAttribute('clickable', true);
         document.getElementById('alertTextLabel').setAttribute('clickable', true);
+      }
     case 3:
       document.getElementById('alertTextLabel').setAttribute('value', window.arguments[2]);
     case 2:
@@ -222,4 +224,5 @@ function onAlertClick()
 {
   if (gAlertListener && gAlertTextClickable)
     gAlertListener.observe(null, "alertclickcallback", gAlertCookie);
+  closeAlert();
 }
diff --git a/toolkit/components/alerts/resources/content/alert.xul b/toolkit/components/alerts/resources/content/alert.xul
index 0bc101dd00bd..1bf820d1fa52 100644
--- a/toolkit/components/alerts/resources/content/alert.xul
+++ b/toolkit/components/alerts/resources/content/alert.xul
@@ -45,7 +45,7 @@
         xhtml:role="alert"
         pack="start"
         onload="onAlertLoad()"
-        onclick="closeAlert();">
+        onclick="onAlertClick();">
   
   <script type="application/javascript" src="chrome://global/content/alerts/alert.js"/>
 
@@ -57,7 +57,7 @@
 
     <vbox id="alertTextBox" class="alertTextBox">
       <label id="alertTitleLabel" class="alertTitle plain"/>
-      <label id="alertTextLabel" class="alertText plain" onclick="onAlertClick();"/>
+      <label id="alertTextLabel" class="alertText plain"/>
     </vbox>
 
   </box>
diff --git a/toolkit/themes/gnomestripe/global/alerts/alert.css b/toolkit/themes/gnomestripe/global/alerts/alert.css
index 67f3d1685728..c30a08ade5ab 100644
--- a/toolkit/themes/gnomestripe/global/alerts/alert.css
+++ b/toolkit/themes/gnomestripe/global/alerts/alert.css
@@ -68,8 +68,15 @@
   -moz-margin-end: 6px;
 }
 
-.alertText[clickable="true"] {
+#alertNotification[clickable="true"] {
   cursor: pointer;
+}
+
+label {
+  cursor: inherit;
+}
+
+.alertText[clickable="true"] {
   color: -moz-nativehyperlinktext;
   text-decoration: underline;
 }
diff --git a/toolkit/themes/winstripe/global/alerts/alert.css b/toolkit/themes/winstripe/global/alerts/alert.css
index 1d487ff9cc8c..b5b1c4643b30 100644
--- a/toolkit/themes/winstripe/global/alerts/alert.css
+++ b/toolkit/themes/winstripe/global/alerts/alert.css
@@ -69,8 +69,15 @@
   -moz-margin-end: 6px;
 }
 
-.alertText[clickable="true"] {
+#alertNotification[clickable="true"] {
   cursor: pointer;
+}
+
+label {
+  cursor: inherit;
+}
+
+.alertText[clickable="true"] {
   color: -moz-nativehyperlinktext;
   text-decoration: underline;
 }