diff --git a/sway/input/seat.c b/sway/input/seat.c
index 273223db7..fc9e54b6e 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -628,6 +628,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
 
 	if (last_workspace && last_workspace == new_workspace
 			&& last_workspace->sway_workspace->fullscreen
+			&& container && container->type == C_VIEW
 			&& !container->sway_view->is_fullscreen) {
 		return;
 	}