diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 52db1dee1ad3..b94b6dbafdbf 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -5799,14 +5799,12 @@ IdentityHandler.prototype = {
   },
 
   /**
-   * Handler for mouseclicks on the "Tell me more about this website" link text
-   * in the "identity-popup" panel.
+   * Handler for mouseclicks on the "More Information" button in the
+   * "identity-popup" panel.
    */
   handleMoreInfoClick : function(event) {
-    if (event.button == 0) {
-      displaySecurityInfo();
-      event.stopPropagation();
-    }   
+    displaySecurityInfo();
+    event.stopPropagation();
   },
   
   /**
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 51b38e1811c4..d6fbd6afd5ff 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -168,7 +168,7 @@
 
     <!-- Popup for site identity information -->
     <panel id="identity-popup" position="after_start" hidden="true" noautofocus="true"
-           onpopupshown="document.getElementById('identity-popup-more-info-link').focus();"
+           onpopupshown="document.getElementById('identity-popup-more-info-button').focus();"
            onpopuphidden="focusAndSelectUrlBar();" norestorefocus="true">
       <hbox id="identity-popup-container" align="top">
         <image id="identity-popup-icon"/>
@@ -189,12 +189,14 @@
             <description id="identity-popup-encryption-label" flex="1"/>
           </hbox>
           <spacer flex="1"/>
-          <!-- Footer link to page info -->
-          <label id="identity-popup-more-info-link"
-                 class="text-link plain"
-                 value="&identity.moreInfoLinkText;"
-                 onblur="getIdentityHandler().hideIdentityPopup();"
-                 onclick="getIdentityHandler().handleMoreInfoClick(event);"/>
+          <!-- Footer button to open security page info -->
+          <hbox>
+            <spacer flex="1"/>
+            <button id="identity-popup-more-info-button"
+                    label="&identity.moreInfoLinkText;"
+                    onblur="getIdentityHandler().hideIdentityPopup();"
+                    oncommand="getIdentityHandler().handleMoreInfoClick(event);"/>
+          </hbox>
         </vbox>
       </hbox>
     </panel>