diff --git a/view.c b/view.c
index acd7603..6b0ed87 100644
--- a/view.c
+++ b/view.c
@@ -234,10 +234,14 @@ view_unmap(struct cg_view *view) {
 			struct cg_tile *view_tile = view_get_tile(view);
 			wlr_output_damage_add_box(view_tile->workspace->output->damage,
 			                          &view_tile->tile);
-			if(view->workspace->server->seat->seat->keyboard_state
-			           .focused_surface == NULL ||
-			   view->workspace->server->seat->seat->keyboard_state
-			           .focused_surface == view->wlr_surface) {
+			if((view->workspace->server->seat->seat->keyboard_state
+			            .focused_surface == NULL ||
+			    view->workspace->server->seat->seat->keyboard_state
+			            .focused_surface == view->wlr_surface) &&
+			   view->workspace->server->curr_output
+			           ->workspaces[view->workspace->server->curr_output
+			                            ->curr_workspace]
+			           ->focused_tile == view_tile) {
 				seat_set_focus(view->workspace->server->seat, prev);
 			} else {
 				view_tile->view = prev;