diff --git a/mozilla/browser/base/content/tabbrowser.xml b/mozilla/browser/base/content/tabbrowser.xml
index b0657a701c3..70f7861b40e 100644
--- a/mozilla/browser/base/content/tabbrowser.xml
+++ b/mozilla/browser/base/content/tabbrowser.xml
@@ -1329,10 +1329,9 @@
         <parameter name="aEvent"/>
         <body>
           <![CDATA[
-            if (aEvent.button == 0 && aEvent.originalTarget.localName != 'tab' &&
-                // Workaround to Bug 224002, the preventBubble() call in the tabbox binding
-                // should block this event.
-                aEvent.originalTarget.localName != "toolbarbutton") {
+            if (aEvent.button == 0 &&
+                // Only capture clicks on tabbox.xml's <spacer>
+                aEvent.originalTarget.localName == "spacer") {
               var e = document.createEvent("Events");
               e.initEvent("NewTab", false, true);
               this.dispatchEvent(e);
