diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 70d70185688..9acbaa52fa9 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -2246,11 +2246,12 @@ Interactively, EVENT is the value of `last-nonmenu-event'."
 				    (plist-get eww-data :url)))))))
       (eww-browse-url
        (concat
-	(if (cdr (assq :action form))
-	    (shr-expand-url (cdr (assq :action form)) (plist-get eww-data :url))
-	  (plist-get eww-data :url))
-	"?"
-	(mm-url-encode-www-form-urlencoded values))))))
+        (shr-expand-url
+         (or (cdr (assq :action form))
+             (car (url-path-and-query (url-generic-parse-url (plist-get eww-data :url)))))
+         (plist-get eww-data :url))
+        "?"
+        (mm-url-encode-www-form-urlencoded values))))))
 
 (defun eww-browse-with-external-browser (&optional url)
   "Browse the current URL with an external browser.