diff --git a/client/cmdmain.c b/client/cmdmain.c
index 322e58064..3cdcd0893 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -20,7 +20,7 @@ static int CmdQuit(const char *Cmd);
 
 static command_t CommandTable[] = 
 {
-  {"help",  CmdHelp,  1, "This help"},
+  {"help",  CmdHelp,  1, "This help. Use '<command> help' for details of the following commands:\n"},
   {"data",  CmdData,  1, "Plot window / data buffer manipulation"},
   {"exit",  CmdQuit,  1, "Exit program"},
   {"hf",    CmdHF,    1, "HF commands"},
@@ -135,4 +135,4 @@ void UsbCommandReceived(UsbCommand *UC)
     PrintAndLog("unrecognized command %08x\n", UC->cmd);
     break;
   }
-}
\ No newline at end of file
+}
diff --git a/client/cmdparser.c b/client/cmdparser.c
index b91f2c9e8..6fca29c2b 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -28,5 +28,6 @@ void CmdsParse(const command_t Commands[], const char *Cmd)
   if (Commands[i].Name)
     Commands[i].Parse(Cmd + len);
   else
-    PrintAndLog("Command not found");
+    // show help (always first in array) for selected hierarchy or if command not recognised
+    Commands[0].Parse("help");
 }