diff --git a/tools/gn/gn_main.cc b/tools/gn/gn_main.cc
index 135ed56..245270e 100644
--- a/tools/gn/gn_main.cc
+++ b/tools/gn/gn_main.cc
@@ -73,9 +73,12 @@
   if (found_command != command_map.end()) {
     retval = found_command->second.runner(args);
   } else {
-    Err(Location(),
-        "Command \"" + command + "\" unknown.").PrintToStdout();
-    commands::RunHelp(std::vector<std::string>());
+    Err(Location(), "Command \"" + command + "\" unknown.").PrintToStdout();
+    OutputString(
+        "Available commands (type \"gn help <command>\" for more details):\n");
+    for (const auto& cmd : commands::GetCommands())
+      PrintShortHelp(cmd.second.help_short);
+
     retval = 1;
   }