diff --git a/extensions/formhistory.c b/extensions/formhistory.c
index b772ef04..1dd535eb 100644
--- a/extensions/formhistory.c
+++ b/extensions/formhistory.c
@@ -202,6 +202,8 @@ formhistory_navigation_decision_cb (WebKitWebView*             web_view,
     const gchar* script = "function dumpForm (inputs) {"
                  "  var out = '';"
                  "  for (i=0;i<inputs.length;i++) {"
+                 "    if (inputs[i].getAttribute('autocomplete') == 'off')"
+                 "        continue;"
                  "    if (inputs[i].value && (inputs[i].type == 'text' || inputs[i].type == 'password')) {"
                  "        var ename = inputs[i].getAttribute('name');"
                  "        var eid = inputs[i].getAttribute('id');"