diff --git a/sway/input/seat.c b/sway/input/seat.c
index 6b00825e4..9ee85e9b3 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -605,10 +605,7 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
 		last_workspace->output : NULL;
 	struct sway_output *new_output = new_workspace->output;
 
-	if (last_output) {
-		node_set_dirty(&last_output->node);
-	}
-	if (new_output) {
+	if (last_workspace != new_workspace && last_output == new_output) {
 		node_set_dirty(&new_output->node);
 	}