diff --git a/mozilla/toolkit/mozapps/extensions/content/extensions.js b/mozilla/toolkit/mozapps/extensions/content/extensions.js
index 3df14b1d212..c2b7d39b282 100644
--- a/mozilla/toolkit/mozapps/extensions/content/extensions.js
+++ b/mozilla/toolkit/mozapps/extensions/content/extensions.js
@@ -446,7 +446,8 @@ function buildContextMenu(aEvent)
 
   var extensionsStrings = document.getElementById("extensionsStrings");
   var menuitem_about = document.getElementById("menuitem_about_clone");
-  var name = document.popupNode.getAttribute("name");
+  var selectedItem = gExtensionsView.selected;
+  var name = selectedItem ? selectedItem.getAttribute("name") : "";
   menuitem_about.setAttribute("label", extensionsStrings.getFormattedString("aboutExtension", [name]));
   
   if (isExtensions) {
@@ -581,9 +582,9 @@ var gExtensionsViewController = {
     case "cmd_options":
       return selectedItem && !selectedItem.disabled && selectedItem.getAttribute("optionsURL") != "";
     case "cmd_about":
-      return !selectedItem || (selectedItem.disabled ? selectedItem.getAttribute("aboutURL") == "" : true);
+      return selectedItem && (selectedItem.disabled ? selectedItem.getAttribute("aboutURL") == "" : true);
     case "cmd_homepage":
-      return (selectedItem && selectedItem.getAttribute("homepageURL") != "");
+      return selectedItem && selectedItem.getAttribute("homepageURL") != "";
     case "cmd_uninstall":
       return selectedItem && selectedItem.getAttribute("locked") != "true";
     case "cmd_update":
@@ -593,12 +594,12 @@ var gExtensionsViewController = {
     case "cmd_disable":
       return selectedItem && selectedItem.getAttribute("locked") != "true" && !selectedItem.disabled;
     case "cmd_movetop":
-      return (gExtensionsView.children[0] != selectedItem);
+      return selectedItem && (gExtensionsView.children[0] != selectedItem);
     case "cmd_moveup":
-      return (gExtensionsView.children[0] != selectedItem);
+      return selectedItem && (gExtensionsView.children[0] != selectedItem);
     case "cmd_movedn":
       var children = gExtensionsView.children;
-      return (children[children.length-1] != selectedItem);
+      return selectedItem && (children[children.length-1] != selectedItem);
 #ifdef MOZ_THUNDERBIRD
     case "cmd_install":
       return true;   
diff --git a/mozilla/toolkit/mozapps/extensions/content/extensions.xul b/mozilla/toolkit/mozapps/extensions/content/extensions.xul
index 05621ffa8c6..011503559e0 100644
--- a/mozilla/toolkit/mozapps/extensions/content/extensions.xul
+++ b/mozilla/toolkit/mozapps/extensions/content/extensions.xul
@@ -135,6 +135,7 @@
 
   <hbox flex="1">
     <view id="extensionsView" flex="3" style="overflow: auto;"
+          context="extensionContextMenu"
           datasources="rdf:null" persist="last-selected"
           ondragover="nsDragAndDrop.dragOver(event, gExtensionsDNDObserver);"
           ondragdrop="nsDragAndDrop.drop(event, gExtensionsDNDObserver);"
@@ -216,7 +217,7 @@
           <action>
             <!-- XXXben - we could really use a variety of different templates
                           here to make each element not be so heavy. -->
-            <extension uri="?extension" context="extensionContextMenu"
+            <extension uri="?extension"
                        image="?icon" name="?name" version="?version" 
                        description="?description" creator="?creator"
                        disabled="?disabled" locked="?locked" 
@@ -269,7 +270,10 @@
                 command="cmd_useTheme"/>
       </hbox>
       <spacer flex="1"/>
-      <label id="getMore" onclick="openURL(gGetMoreURL);"
+
+      <label id="getMore"
+             onclick="openURL(gGetMoreURL);"
+             onkeypress="if (event.keyCode == event.DOM_VK_ENTER || event.keyCode == event.DOM_VK_RETURN) openURL(gGetMoreURL);"
              valuethemes="&getMoreThemes.label;"
              valueextensions="&getMoreExtensions.label;"
              tooltiptextthemes="&getMoreThemes.tooltip;"
diff --git a/mozilla/toolkit/themes/pinstripe/mozapps/extensions/extensions.css b/mozilla/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
index 7e928b7a6bd..f41ef4c2428 100644
--- a/mozilla/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
+++ b/mozilla/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
@@ -26,7 +26,6 @@ view {
 
 #uninstallButton {
   margin: 0px;
-  -moz-user-focus: ignore;
   list-style-image: url("chrome://mozapps/skin/extensions/actionbuttons.png");
   -moz-image-region: rect(0px, 32px, 26px, 0px) !important;
 }
@@ -43,7 +42,6 @@ view {
 
 #updateButton {
   margin: 0px;
-  -moz-user-focus: ignore;
   list-style-image: url("chrome://mozapps/skin/extensions/actionbuttons.png");
   -moz-image-region: rect(0px, 64px, 26px, 32px);
   -moz-appearance: none;
@@ -61,7 +59,6 @@ view {
 
 #useThemeButton {
   margin: 0px;
-  -moz-user-focus: ignore;
   list-style-image: url("chrome://mozapps/skin/extensions/actionbuttons.png");
   -moz-image-region: rect(0px, 96px, 26px, 64px) !important;
 }
@@ -113,6 +110,11 @@ view {
   text-decoration: underline !important;
   cursor: pointer;
   text-align: right;
+  -moz-user-focus: normal;
+}
+
+#getMore:focus {
+  -moz-outline: 1px dotted invert ! important;
 }
 
 /* Extension Buttons (Iconic buttons in each extension item) */
diff --git a/mozilla/toolkit/themes/qute/mozapps/extensions/extensions.css b/mozilla/toolkit/themes/qute/mozapps/extensions/extensions.css
index 2d6cb0e8042..a072d5cf34f 100644
--- a/mozilla/toolkit/themes/qute/mozapps/extensions/extensions.css
+++ b/mozilla/toolkit/themes/qute/mozapps/extensions/extensions.css
@@ -19,7 +19,6 @@
 
 #uninstallButton {
   margin: 0px;
-  -moz-user-focus: ignore;
   list-style-image: url("chrome://mozapps/skin/extensions/actionbuttons.png");
   -moz-image-region: rect(0px, 20px, 20px, 0px) !important;
 }
@@ -31,7 +30,6 @@
 
 #updateButton {
   margin: 0px;
-  -moz-user-focus: ignore;
   list-style-image: url("chrome://mozapps/skin/extensions/actionbuttons.png");
   -moz-image-region: rect(0px, 40px, 20px, 20px) !important;
 }
@@ -43,7 +41,6 @@
 
 #useThemeButton {
   margin: 0px;
-  -moz-user-focus: ignore;
   list-style-image: url("chrome://mozapps/skin/extensions/actionbuttons.png");
   -moz-image-region: rect(0px, 60px, 20px, 40px) !important;
 }
@@ -66,6 +63,11 @@
   text-decoration: underline !important;
   cursor: pointer;
   text-align: right;
+  -moz-user-focus: normal;
+}
+
+#getMore:focus {
+  -moz-outline: 1px dotted invert ! important;
 }
 
 /* Extension Buttons (Iconic buttons in each extension item) */
diff --git a/mozilla/toolkit/themes/winstripe/mozapps/extensions/extensions.css b/mozilla/toolkit/themes/winstripe/mozapps/extensions/extensions.css
index 716f1be03ef..57a87efcae4 100644
--- a/mozilla/toolkit/themes/winstripe/mozapps/extensions/extensions.css
+++ b/mozilla/toolkit/themes/winstripe/mozapps/extensions/extensions.css
@@ -19,7 +19,6 @@
 
 #uninstallButton {
   margin: 0px;
-  -moz-user-focus: ignore;
   list-style-image: url("chrome://mozapps/skin/extensions/actionbuttons.png");
   -moz-image-region: rect(0px, 21px, 21px, 0px) !important;
 }
@@ -31,7 +30,6 @@
 
 #updateButton {
   margin: 0px;
-  -moz-user-focus: ignore;
   list-style-image: url("chrome://mozapps/skin/extensions/actionbuttons.png");
   -moz-image-region: rect(0px, 42px, 21px, 21px) !important;
 }
@@ -43,7 +41,6 @@
 
 #useThemeButton {
   margin: 0px;
-  -moz-user-focus: ignore;
   list-style-image: url("chrome://mozapps/skin/extensions/actionbuttons.png");
   -moz-image-region: rect(0px, 63px, 21px, 42px) !important;
 }
@@ -66,6 +63,11 @@
   text-decoration: underline !important;
   cursor: pointer;
   text-align: right;
+  -moz-user-focus: normal;
+}
+
+#getMore:focus {
+  -moz-outline: 1px dotted invert ! important;
 }
 
 /* Extension Buttons (Iconic buttons in each extension item) */