diff --git a/qutebrowser/javascript/cycle-inputs.js b/qutebrowser/javascript/cycle-inputs.js
new file mode 100644
index 000000000..9f4faaa78
--- /dev/null
+++ b/qutebrowser/javascript/cycle-inputs.js
@@ -0,0 +1,46 @@
+/* Cycle <input> text boxes.
+ * works with the types defined in 'types'.
+ * Note: Does not work for <textarea>.
+ *
+ * Example keybind:
+ * CYCLE_INPUTS = "jseval -q -f ~/.config/qutebrowser/cycle-inputs.js"
+ * config.bind('gi', CYCLE_INPUTS)
+ *
+ * By dive on freenode <dave@dawoodfall.net>
+ */
+
+"use strict";
+var inputs = document.getElementsByTagName("input");
+var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
+var hidden = /hidden/;
+var found = false;
+var ii = 0;
+var jj = 0;
+
+function ishidden(el) {
+    return hidden.test(el.attributes.value) || el.offsetParent === null;
+}
+
+for (ii = 0; ii < inputs.length; ii++) {
+    if (inputs[ii] === document.activeElement) {
+        for (jj = ii + 1; jj < inputs.length; jj++) {
+            if (!ishidden(inputs[jj]) && types.test(inputs[jj].type)) {
+                inputs[jj].focus();
+                found = true;
+                break;
+            }
+        }
+        break;
+    }
+}
+
+if (!found) {
+    for (ii = 0; ii < inputs.length; ii++) {
+        if (!ishidden(inputs[ii]) && types.test(inputs[ii].type)) {
+            inputs[ii].focus();
+            break;
+        }
+    }
+}
+
+// vim: tw=0 expandtab tabstop=4 softtabstop=4 shiftwidth=4
diff --git a/scripts/cycle-inputs.js b/scripts/cycle-inputs.js
index c395f6de2..9f4faaa78 100644
--- a/scripts/cycle-inputs.js
+++ b/scripts/cycle-inputs.js
@@ -1,43 +1,46 @@
 /* Cycle <input> text boxes.
  * works with the types defined in 'types'.
  * Note: Does not work for <textarea>.
- * 
- * Example keybind: 
+ *
+ * Example keybind:
  * CYCLE_INPUTS = "jseval -q -f ~/.config/qutebrowser/cycle-inputs.js"
  * config.bind('gi', CYCLE_INPUTS)
  *
  * By dive on freenode <dave@dawoodfall.net>
  */
 
+"use strict";
 var inputs = document.getElementsByTagName("input");
-var found = false;
 var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
 var hidden = /hidden/;
+var found = false;
+var ii = 0;
+var jj = 0;
 
 function ishidden(el) {
-	return hidden.test(el.attributes.value) || el.offsetParent === null;
+    return hidden.test(el.attributes.value) || el.offsetParent === null;
 }
 
-for (var i = 0; i < inputs.length; i++) {
-	if (inputs[i] == document.activeElement) {
-		for (var j = i+1; j < inputs.length; j++) {
-			if (! ishidden(inputs[j]) && types.test(inputs[j].type)) {
-				inputs[j].focus();
-				found = true;
-				break;
-			}
-		}
-		break;
-	}
+for (ii = 0; ii < inputs.length; ii++) {
+    if (inputs[ii] === document.activeElement) {
+        for (jj = ii + 1; jj < inputs.length; jj++) {
+            if (!ishidden(inputs[jj]) && types.test(inputs[jj].type)) {
+                inputs[jj].focus();
+                found = true;
+                break;
+            }
+        }
+        break;
+    }
 }
 
-if (! found) {
-	for (i = 0; i < inputs.length; i++) {
-		if (! ishidden(inputs[i]) && types.test(inputs[i].type)) {
-			inputs[i].focus();
-			break;
-		}
-	}
+if (!found) {
+    for (ii = 0; ii < inputs.length; ii++) {
+        if (!ishidden(inputs[ii]) && types.test(inputs[ii].type)) {
+            inputs[ii].focus();
+            break;
+        }
+    }
 }
 
-// vim: tw=0
+// vim: tw=0 expandtab tabstop=4 softtabstop=4 shiftwidth=4