diff --git a/misc/userscripts/password_fill b/misc/userscripts/password_fill
index 2a5c21792..4da4ebe90 100755
--- a/misc/userscripts/password_fill
+++ b/misc/userscripts/password_fill
@@ -92,7 +92,14 @@ simplify_url() {
 # are found:
 no_entries_found() {
     while [ 0 -eq "${#files[@]}" ] && [ -n "$simple_url" ]; do
-        simple_url=$(sed 's,^[^.]*\.,,' <<< "$simple_url")
+        shorter_simple_url=$(sed 's,^[^.]*\.,,' <<< "$simple_url")
+        if [ "$shorter_simple_url" = "$simple_url" ] ; then
+            # if no dot, then even remove the top level domain
+            simple_url=""
+            query_entries "$simple_url"
+            break
+        fi
+        simple_url="$shorter_simple_url"
         query_entries "$simple_url"
         #die "No entry found for »$simple_url«"
         # enforce menu if we do "fuzzy" matching