diff --git a/toolkit/content/widgets/menulist.xml b/toolkit/content/widgets/menulist.xml
index 1e4131a6a99a..b3437f387d6b 100644
--- a/toolkit/content/widgets/menulist.xml
+++ b/toolkit/content/widgets/menulist.xml
@@ -24,20 +24,12 @@
     </content>
 
     <handlers>
-      <handler event="command" phase="capturing">
-        <![CDATA[
-          // XXX see bug #196755
-          // originalTarget is workaround for arrowscrollbox retargeting bug
-          if (event.originalTarget.parentNode.parentNode == this)
-            this.selectedItem = event.originalTarget;
-        ]]>
-      </handler>
+      <handler event="command" phase="capturing"
+        action="if (event.target.parentNode.parentNode == this) this.selectedItem = event.target;"/>
         
       <handler event="popupshowing">
         <![CDATA[
-          // XXX see bug #196755
-          // originalTarget is workaround for arrowscrollbox retargeting bug
-          if (event.originalTarget.parentNode == this && this.selectedItem)
+          if (event.target.parentNode == this && this.selectedItem)
             // Not ready for auto-setting the active child in hierarchies yet.
             // For now, only do this when the outermost menupopup opens.
             this.menuBoxObject.activeChild = this.selectedInternal;
@@ -414,9 +406,7 @@
         <![CDATA[
           // editable menulists elements aren't in the focus order,
           // so when the popup opens we need to force the focus to the inputField
-          // XXX see bug #196755
-          // originalTarget is workaround for arrowscrollbox retargeting bug
-          if (event.originalTarget.parentNode == this) {
+          if (event.target.parentNode == this) {
             if (document.commandDispatcher.focusedElement != this.inputField) 
               this.inputField.focus();
 
diff --git a/toolkit/content/widgets/tabbrowser.xml b/toolkit/content/widgets/tabbrowser.xml
index e85bbecceb98..bbd829f24567 100644
--- a/toolkit/content/widgets/tabbrowser.xml
+++ b/toolkit/content/widgets/tabbrowser.xml
@@ -80,7 +80,6 @@
           <xul:tabs class="tabbrowser-tabs" closebutton="true" flex="1"
                     setfocus="false"
                     onclick="this.parentNode.parentNode.parentNode.onTabClick(event);"
-                    onmousedown="this.parentNode.parentNode.parentNode.updateContextTab(event);"
                     ondragover="nsDragAndDrop.dragOver(event, this.parentNode.parentNode.parentNode);
                                 event.stopPropagation();"
                     ondragdrop="nsDragAndDrop.drop(event, this.parentNode.parentNode.parentNode);
@@ -491,8 +490,8 @@
             if (this.docShell.contentViewer)
               docTitle = this.contentTitle;
             
-	          if (!docTitle)
-	            docTitle = this.ownerDocument.documentElement.getAttribute("titledefault");
+            if (!docTitle)
+              docTitle = this.ownerDocument.documentElement.getAttribute("titledefault");
 
             var modifier = this.ownerDocument.documentElement.getAttribute("titlemodifier");
             if (docTitle) {
@@ -508,22 +507,11 @@
         </body>
       </method>
 
-      <method name="updateContextTab">
-        <parameter name="aEvent"/>
-        <body>
-          <![CDATA[
-            if (aEvent.originalTarget.localName == "tab")
-              this.mContextTab = aEvent.originalTarget;
-            else
-              this.mContextTab = document.popupNode;
-          ]]>
-        </body>
-      </method>
-
       <method name="updatePopupMenu">
         <parameter name="aPopupMenu"/>
         <body>
           <![CDATA[
+            this.mContextTab = document.popupNode;
             var disabled = this.mPanelContainer.childNodes.length == 1;
             var menuItems = aPopupMenu.getElementsByAttribute("tbattr", "tabbrowser-multiple");
             for (var i = 0; i < menuItems.length; i++)
