diff --git a/extra/gopher/gopher.factor b/extra/gopher/gopher.factor
index c5dec8b18e..feb609efd8 100644
--- a/extra/gopher/gopher.factor
+++ b/extra/gopher/gopher.factor
@@ -93,8 +93,8 @@ ERROR: not-a-gopher-url url ;
     dup protocol>> "gopher" = [ not-a-gopher-url ] unless {
         [ host>> ]
         [ port>> 70 or <inet> binary ]
-        [ path>> rest ]
-        [ query>> assoc>query url-decode "?" glue ]
+        [ path>> rest [ "1/" ] when-empty ]
+        [ query>> [ assoc>query url-decode "?" glue ] when* ]
     } cleave '[ _ get-selector ] with-client ;
 
 : gopher. ( url -- )