diff --git a/qutebrowser/browser/webkit/webelem.py b/qutebrowser/browser/webkit/webelem.py
index 9b84a7379..d73341178 100644
--- a/qutebrowser/browser/webkit/webelem.py
+++ b/qutebrowser/browser/webkit/webelem.py
@@ -51,7 +51,8 @@ SELECTORS = {
Group.focus: '*:focus',
Group.inputs: ('input[type=text], input[type=email], input[type=url], '
'input[type=tel], input[type=number], '
- 'input[type=password], input[type=search], textarea'),
+ 'input[type=password], input[type=search], '
+ 'input:not([type]), textarea'),
}
diff --git a/tests/end2end/data/hints/input.html b/tests/end2end/data/hints/input.html
new file mode 100644
index 000000000..87cc3b347
--- /dev/null
+++ b/tests/end2end/data/hints/input.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+ Simple input
+
+
+
+
+
diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 1aa4cb53b..341bbaa96 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -119,6 +119,15 @@ Feature: Using hints
And I run :follow-hint a
Then the error "Invalid link clicked - *" should be shown
+ Scenario: Hinting inputs without type
+ When I open data/hints/input.html
+ And I run :hint inputs
+ And I run :follow-hint a
+ And I wait for "Entering mode KeyMode.insert (reason: click)" in the log
+ And I run :leave-mode
+ # The actual check is already done above
+ Then no crash should happen
+
### iframes
Scenario: Using :follow-hint inside an iframe