diff --git a/src/shared/shell.c b/src/shared/shell.c
index 7417e7a..9cd8d25 100644
--- a/src/shared/shell.c
+++ b/src/shared/shell.c
@@ -645,10 +645,16 @@ static char *cmd_generator(const char *text, int state)
 	cmd = find_cmd(text + strlen(menu->name) + 1, menu->entries, &index);
 	if (cmd) {
 		int err;
+		char *tmp;
+
+		err = asprintf(&tmp, "%s.%s", menu->name, cmd);
+
+		free(cmd);
 
-		err = asprintf(&cmd, "%s.%s", menu->name, cmd);
 		if (err < 0)
 			return NULL;
+
+		cmd = tmp;
 	}
 
 	return cmd;