diff --git a/suite/common/history/history-panel.xul b/suite/common/history/history-panel.xul
index 7e25c90be6..1f8a6d7965 100644
--- a/suite/common/history/history-panel.xul
+++ b/suite/common/history/history-panel.xul
@@ -72,7 +72,7 @@
     <textbox id="search-box" flex="1" type="search"
              emptytext="&search.emptytext;" clickSelectsAll="true"
              oncommand="searchHistory(this.value);"/>
-    <toolbarbutton id="viewButton" type="menu" style="-moz-user-focus: normal;"
+    <toolbarbutton id="viewButton" type="menu" class="tabbable"
                    label="&view.label;">
       <menupopup id="viewPopup"/>
     </toolbarbutton>
diff --git a/suite/common/sidebar/sidebarOverlay.xul b/suite/common/sidebar/sidebarOverlay.xul
index a57b4c968d..2a1396eb19 100644
--- a/suite/common/sidebar/sidebarOverlay.xul
+++ b/suite/common/sidebar/sidebarOverlay.xul
@@ -85,7 +85,7 @@
         collapse="after" onmouseup="PersistHeight();"
         tooltipopen="&sidebar.open.tooltip;" 
         tooltipclose="&sidebar.close.tooltip;">
-        <toolbarbutton type="menu" id="sidebar-panel-picker" menubuttontype="sidebar-panels"
+        <toolbarbutton type="menu" id="sidebar-panel-picker" class="tabbable"
           onpopupshowing="SidebarBuildPickerPopup();"
           label="&sidebar.picker.label;" >
           <menupopup id="sidebar-panel-picker-popup"
diff --git a/suite/themes/classic/communicator/sidebar/sidebar.css b/suite/themes/classic/communicator/sidebar/sidebar.css
index c99130502b..8793ce746c 100644
--- a/suite/themes/classic/communicator/sidebar/sidebar.css
+++ b/suite/themes/classic/communicator/sidebar/sidebar.css
@@ -63,8 +63,6 @@
 
 #sidebar-panel-picker {
   color: inherit;
-  /** bugzilla 89144 - must be able to access tabs dropdown **/
-  -moz-user-focus:normal !important;
 }
 
 #sidebar-panel-picker > .toolbarbutton-dropmarker {
diff --git a/suite/themes/modern/communicator/sidebar/sidebar.css b/suite/themes/modern/communicator/sidebar/sidebar.css
index a3272d2736..68c9bea84a 100644
--- a/suite/themes/modern/communicator/sidebar/sidebar.css
+++ b/suite/themes/modern/communicator/sidebar/sidebar.css
@@ -67,8 +67,6 @@
   -moz-margin-end: 1px;
   margin-top: 1px;
   padding: 2px;
-  /** bugzilla 89144 - must be able to access tabs dropdown **/
-  -moz-user-focus:normal !important;
 }
 
 #sidebar-panel-picker:hover {
diff --git a/suite/themes/modern/global/toolbarbutton.css b/suite/themes/modern/global/toolbarbutton.css
index 58d2a71654..ca83e80735 100644
--- a/suite/themes/modern/global/toolbarbutton.css
+++ b/suite/themes/modern/global/toolbarbutton.css
@@ -61,6 +61,11 @@ toolbarbutton {
   text-align: center;
 }
 
+.tabbable {
+  -moz-user-focus: normal !important;
+}
+
+toolbarbutton:focus,
 toolbarbutton:hover {
   border-top-color: #EEF0F3;
   border-right-color: #86929E;