diff --git a/server-client.c b/server-client.c
index 1f0ac66f..d514b11e 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1286,7 +1286,7 @@ forward_key:
 		window_pane_key(wp, c, s, wl, key, m);
 
 out:
-	if (s != NULL)
+	if (s != NULL && key != KEYC_FOCUS_OUT)
 		server_client_update_latest(c);
 	free(event);
 	return (CMD_RETURN_NORMAL);
diff --git a/tty-keys.c b/tty-keys.c
index 5a2b3817..bbd4bb5f 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -800,13 +800,10 @@ complete_key:
 	tty->flags &= ~TTY_TIMER;
 
 	/* Check for focus events. */
-	if (key == KEYC_FOCUS_OUT) {
+	if (key == KEYC_FOCUS_OUT)
 		tty->client->flags &= ~CLIENT_FOCUSED;
-		return (1);
-	} else if (key == KEYC_FOCUS_IN) {
+	else if (key == KEYC_FOCUS_IN)
 		tty->client->flags |= CLIENT_FOCUSED;
-		return (1);
-	}
 
 	/* Fire the key. */
 	if (key != KEYC_UNKNOWN) {