diff --git a/README.md b/README.md
index 3c999cee8bbcb5b0bfbc6732f9ecea0ba231d043..aa9f811a9bfd9cfb7b6654954e33fc62e868f8c4 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@
It includes the following modifications:
- colored headings & links
- default 4 char indenting
+- s command to directly search in geminispace (via geminispace.info)
- k command to remove the bookmark for the current page
- e[N] command to open a link in default external program (requires `xdg-open`)
- t[N] command to download the content behind a link to a temporary file
diff --git a/src/gmnlm.c b/src/gmnlm.c
index 2c35f76f8ee4b6dfa6af5bbe8af790a3e98afbbc..e28bf70afc5d6fd4c5c6eff85d85198d62a127e8 100644
--- a/src/gmnlm.c
+++ b/src/gmnlm.c
@@ -93,6 +93,7 @@ "m\t\tSave bookmark\n"
"M\t\tBrowse bookmarks\n"
"k\t\tRemove bookmark for current page\n"
"r\t\tReload the page\n"
+ "s\t\tSearch via geminispace.info\n"
"/<text>\t\tsearch for text (POSIX regular expression)\n"
"n\t\tjump to next search match\n"
"d <path>\tDownload page to <path>\n"
@@ -567,6 +568,11 @@ goto exit;
case 'q':
if (in[1]) break;
result = PROMPT_QUIT;
+ goto exit;
+ case 's':
+ if (in[1]) break;
+ set_url(browser, "gemini://geminispace.info/search", &browser->history);
+ result = PROMPT_ANSWERED;
goto exit;
case 'b':
if (in[1]) historyhops =(int)strtol(in+1, &endptr, 10);