diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index d8907037692b..d3fa5c21cd10 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -380,6 +380,11 @@ BrowserGlue.prototype = {
           if (win) {
             data = JSON.parse(data);
             let where = win.whereToOpenLink(data);
+            // Preserve legacy behavior of non-modifier left-clicks
+            // opening in a new selected tab.
+            if (where == "current") {
+              where = "tab";
+            }
             win.openUILinkIn(data.href, where);
             linkHandled.data = true;
           }
diff --git a/toolkit/content/widgets/text.xml b/toolkit/content/widgets/text.xml
index 572dc0aa3935..ed998cee4799 100644
--- a/toolkit/content/widgets/text.xml
+++ b/toolkit/content/widgets/text.xml
@@ -357,17 +357,6 @@
                                       .createInstance(Components.interfaces.nsISupportsPRBool);
           linkHandled.data = false;
           let {shiftKey, ctrlKey, metaKey, altKey, button} = aEvent;
-          if (!shiftKey && !altKey) {
-            // Preserve legacy behavior of non-modifier left-clicks
-            // opening in a new selected tab.
-            let {AppConstants} =
-              Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
-            if (AppConstants.platform == "macosx") {
-              metaKey = true;
-            } else {
-              ctrlKey = true;
-            }
-          }
           let data = {shiftKey, ctrlKey, metaKey, altKey, button, href};
           Components.classes["@mozilla.org/observer-service;1"]
                     .getService(Components.interfaces.nsIObserverService)