diff --git a/waybox/xdg_shell.c b/waybox/xdg_shell.c
index 4fa8889..2a1a3c1 100644
--- a/waybox/xdg_shell.c
+++ b/waybox/xdg_shell.c
@@ -57,7 +57,7 @@ static void xdg_surface_unmap(struct wl_listener *listener, void *data) {
 		focus_view(current_view, current_view->xdg_surface->surface);
 	}
 	/* Otherwise, focus the next view, if any. */
-	else if (next_view->xdg_surface->surface) {
+	else if (next_view->xdg_surface->surface && wlr_surface_is_xdg_surface(next_view->xdg_surface->surface)) {
 		focus_view(next_view, next_view->xdg_surface->surface);
 	}
 }