diff --git a/src/fe-common/core/fe-help.c b/src/fe-common/core/fe-help.c
index 76e4c6d2..09485fac 100644
--- a/src/fe-common/core/fe-help.c
+++ b/src/fe-common/core/fe-help.c
@@ -252,12 +252,10 @@ static void show_help(const char *data)
 /* SYNTAX: HELP [<command>] */
 static void cmd_help(const char *data)
 {
-	char *cmd, *ptr;
+	char *cmd;
 
 	cmd = g_strdup(data);
-	ptr = cmd+strlen(cmd);
-	while (ptr[-1] == ' ') ptr--; *ptr = '\0';
-
+	g_strchomp(cmd);
 	g_strdown(cmd);
 	show_help(cmd);
         g_free(cmd);