diff --git a/server-client.c b/server-client.c
index 3fd16ec5..d5d88717 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1226,6 +1226,7 @@ server_client_handle_key(struct client *c, struct key_event *event)
 				return (0);
 			}
 		}
+		server_client_clear_overlay(c);
 	}
 
 	/*