diff --git a/commands/help.c b/commands/help.c
index fecc6f665..1ca46aa7e 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -112,7 +112,8 @@ grub_cmd_help (grub_extcmd_context_t ctxt __attribute__ ((unused)), int argc,
 		    if (cnt++ > 0)
 		      grub_printf ("\n\n");
 
-		    if (cmd->flags & GRUB_COMMAND_FLAG_EXTCMD)
+		    if ((cmd->flags & GRUB_COMMAND_FLAG_EXTCMD) &&
+			! (cmd->flags & GRUB_COMMAND_FLAG_DYNCMD))
 		      grub_arg_show_help ((grub_extcmd_t) cmd->data);
 		    else
 		      grub_printf ("%s %s %s\n%s\n", _("Usage:"), cmd->name, _(cmd->summary),
diff --git a/normal/dyncmd.c b/normal/dyncmd.c
index ed98855eb..3519253f6 100644
--- a/normal/dyncmd.c
+++ b/normal/dyncmd.c
@@ -155,6 +155,7 @@ read_command_list (const char *prefix)
 						   grub_dyncmd_dispatcher,
 						   GRUB_COMMAND_FLAG_BLOCKS
 						   | GRUB_COMMAND_FLAG_EXTCMD
+						   | GRUB_COMMAND_FLAG_CMDLINE
 						   | GRUB_COMMAND_FLAG_DYNCMD,
 						   0, N_("not loaded"), 0,
 						   prio);