diff --git a/scripts/w3mman/w3mman.in b/scripts/w3mman/w3mman.in
index 061cb1f..3c9a546 100644
--- a/scripts/w3mman/w3mman.in
+++ b/scripts/w3mman/w3mman.in
@@ -31,7 +31,7 @@ while (@ARGV) {
     $query .= "&pwd=" . &form_encode($ENV{'PWD'});
   } elsif (/^-/) {
     &usage();
-  } elsif (/^\d/ || $_ eq 'n' || $_ eq 'l') {
+  } elsif ($query !~ /&section=/ && (/^\d/ || $_ eq 'n' || $_ eq 'l')) {
     if ( $query eq "" ) { $query = "?quit=ok"; }
     $query .= "&section=" . &form_encode($_);
   } else {
@@ -39,6 +39,9 @@ while (@ARGV) {
     $query .= "&man=" . &form_encode($_);
   }
 }
+if ($query =~ /&section=/ && $query !~ /&keyword=/ && $query !~ /&man=/) {
+  $query =~ s/&section=/&man=/;
+}
 
 exec @W3M, "$SCRIPT$query";