diff --git a/src/kits/network/libnetapi/GopherRequest.cpp b/src/kits/network/libnetapi/GopherRequest.cpp
index 70d44af03b..5b82d02822 100644
--- a/src/kits/network/libnetapi/GopherRequest.cpp
+++ b/src/kits/network/libnetapi/GopherRequest.cpp
@@ -510,10 +510,12 @@ BGopherRequest::_ParseInput(bool last)
 				 * For now we use an unnamed input field and accept sending ?=foo
 				 * as it seems at least Veronica-2 ignores the = but it's unclean.
 				 */
-				item << "<form method=\"get\" action=\"" << link << "\">"
+				item << "<form method=\"get\" action=\"" << link << "\" "
+							"onsubmit=\"window.location = this.action + '?' + "
+								"this.elements['q'].value; return false;\">"
 						"<span class=\"query\">"
 						"<label>" << title << " "
-						"<input name=\"\" type=\"text\" align=\"right\" />"
+						"<input id=\"q\" name=\"\" type=\"text\" align=\"right\" />"
 						"</label>"
 						"</span></form>"
 						"<br/>\n";