diff --git a/desktop-shell/exposay.c b/desktop-shell/exposay.c
index 1d8b40e1..104b9d95 100644
--- a/desktop-shell/exposay.c
+++ b/desktop-shell/exposay.c
@@ -323,8 +323,10 @@ exposay_layout(struct desktop_shell *shell, struct shell_output *shell_output)
 		i++;
 	}
 
-	if (highlight)
+	if (highlight) {
+		shell->exposay.focus_current = NULL;
 		exposay_highlight_surface(shell, highlight);
+	}
 
 	weston_compositor_schedule_repaint(shell->compositor);