diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index ae727f9f..a528580b 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -1242,9 +1242,9 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
 
         let re = util.regexp(<![CDATA[
                 ^ (
-                    <domain>+ \. [a-z0-9]+ (:\d+)? (/ .*)? |
                     <domain>+ (:\d+)? (/ .*) |
                     <domain>+ (:\d+) |
+                    <domain>+ \. [a-z0-9]+ |
                     localhost
                 ) $
             ]]>, "gi", {
diff --git a/common/content/modes.js b/common/content/modes.js
index 64334921..837682fc 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -168,7 +168,7 @@ var Modes = Module("modes", {
                     prefs.set("accessibility.browsewithcaret", false);
 
                 statusline.updateUrl();
-                if (!stack.fromFocus && (prev.main.input || prev.main.ownsFocus))
+                if (!stack.fromFocus && prev.main.ownsFocus)
                     dactyl.focusContent(true);
                 if (prev.main == modes.NORMAL) {
                     dactyl.focusContent(true);