diff --git a/popup.c b/popup.c
index 48a61450..ca1f9a3f 100644
--- a/popup.c
+++ b/popup.c
@@ -513,10 +513,10 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
 		    m->y > pd->py + pd->sy - 1) {
 			if (MOUSE_BUTTONS(m->b) == MOUSE_BUTTON_3)
 				goto menu;
-			c->flags &= ~CLIENT_OVERLAYPOPUP_FOCUSED;
+			c->flags &= ~CLIENT_OVERLAYFOCUSED;
 			return (0);
 		}
-		c->flags |= CLIENT_OVERLAYPOPUP_FOCUSED;
+		c->flags |= CLIENT_OVERLAYFOCUSED;
 		if (pd->border_lines != BOX_LINES_NONE) {
 			if (m->x == pd->px)
 				border = LEFT;
@@ -563,7 +563,7 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
 			bufferevent_write(job_get_event(pd->job), buf, len);
 			return (0);
 		}
-		if (c->flags & CLIENT_OVERLAYPOPUP_FOCUSED)
+		if (c->flags & CLIENT_OVERLAYFOCUSED)
 			input_key(&pd->s, job_get_event(pd->job), event->key);
 	}
 	return (0);
@@ -728,7 +728,7 @@ popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
 
 	server_client_set_overlay(c, 0, popup_check_cb, popup_mode_cb,
 	    popup_draw_cb, popup_key_cb, popup_free_cb, popup_resize_cb, pd);
-	c->flags |= CLIENT_OVERLAYPOPUP_FOCUSED;
+	c->flags |= CLIENT_OVERLAYFOCUSED;
 	return (0);
 }
 
diff --git a/server-client.c b/server-client.c
index e9057339..86d84425 100644
--- a/server-client.c
+++ b/server-client.c
@@ -2630,7 +2630,7 @@ server_client_handle_key(struct client *c, struct key_event *event)
 		if (c->overlay_key != NULL) {
 			done = c->overlay_key(c, c->overlay_data, event);
 			TAILQ_FOREACH(wp, &c->session->curw->window->panes, entry) {
-				if (~c->flags & CLIENT_OVERLAYPOPUP_FOCUSED)
+				if (~c->flags & CLIENT_OVERLAYFOCUSED)
 					goto focused;
 			}
 			if (done)
@@ -2933,7 +2933,7 @@ server_client_reset_state(struct client *c)
 	tty->flags &= ~TTY_BLOCK;
 
 	/* Get mode from overlay if any, else from screen. */
-	if (c->overlay_draw != NULL && c->flags & CLIENT_OVERLAYPOPUP_FOCUSED) {
+	if (c->overlay_draw != NULL && c->flags & CLIENT_OVERLAYFOCUSED) {
 		if (c->overlay_mode != NULL)
 			s = c->overlay_mode(c, c->overlay_data, &cx, &cy);
 	} else if (c->prompt_string == NULL)
@@ -2964,7 +2964,7 @@ server_client_reset_state(struct client *c)
 				cy = tty->sy - n;
 		}
 		cx = c->prompt_cursor;
-	} else if (c->overlay_draw == NULL || ~c->flags & CLIENT_OVERLAYPOPUP_FOCUSED) {
+	} else if (c->overlay_draw == NULL || ~c->flags & CLIENT_OVERLAYFOCUSED) {
 		cursor = 0;
 		tty_window_offset(tty, &ox, &oy, &sx, &sy);
 		if (wp->xoff + s->cx >= ox && wp->xoff + s->cx <= ox + sx &&
diff --git a/tmux.h b/tmux.h
index c9745253..2bae04eb 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1982,7 +1982,7 @@ struct client {
 #define CLIENT_ASSUMEPASTING 0x2000000000ULL
 #define CLIENT_REDRAWSCROLLBARS 0x4000000000ULL
 #define CLIENT_NO_DETACH_ON_DESTROY 0x8000000000ULL
-#define CLIENT_OVERLAYPOPUP_FOCUSED 0x10000000000ULL
+#define CLIENT_OVERLAYFOCUSED 0x10000000000ULL
 #define CLIENT_ALLREDRAWFLAGS		\
 	(CLIENT_REDRAWWINDOW|		\
 	 CLIENT_REDRAWSTATUS|		\