diff --git a/apps/app_queue.c b/apps/app_queue.c
index 32091e92a5..4547b3ad56 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -4255,6 +4255,13 @@ static char *complete_queue(const char *line, const char *word, int pos, int sta
 	return ret;
 }
 
+static char *complete_queue_show(const char *line, const char *word, int pos, int state)
+{
+	if (pos == 2)
+		return complete_queue(line, word, pos, state);
+	return NULL;
+}
+
 /*!\brief callback to display queues status in manager
    \addtogroup Group_AMI
  */
@@ -4709,7 +4716,7 @@ static const char qrm_cmd_usage[] =
 static struct ast_cli_entry cli_queue[] = {
 	{ { "queue", "show", NULL },
 	queue_show, "Show status of a specified queue",
-	queue_show_usage, complete_queue, NULL },
+	queue_show_usage, complete_queue_show, NULL },
 
 	{ { "queue", "add", "member", NULL },
 	handle_queue_add_member, "Add a channel to a specified queue",