diff --git a/cmd-queue.c b/cmd-queue.c
index 36f1c9be..05f439f5 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -768,7 +768,11 @@ cmdq_running(struct client *c)
 {
 	struct cmdq_list	*queue = cmdq_get(c);
 
-	return (queue->item);
+	if (queue->item == NULL)
+        return (NULL);
+    if (queue->item->flags & CMDQ_WAITING)
+        return (NULL);
+    return (queue->item);
 }
 
 /* Print a guard line. */
diff --git a/tmux.1 b/tmux.1
index 3d83a308..500d5473 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2112,7 +2112,8 @@ and
 .Ic display-panes-active-colour
 session options.
 The indicator is closed when a key is pressed (unless
-.Fl N is given) or
+.Fl N
+is given) or
 .Ar duration
 milliseconds have passed.
 If