diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 34a9ae4e2..7f84b6f3d 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4451,7 +4451,7 @@ switcher_destroy(struct switcher *switcher)
 		weston_surface_damage(view->surface);
 	}
 
-	if (switcher->current) {
+	if (switcher->current && get_shell_surface(switcher->current->surface)) {
 		activate(switcher->shell, switcher->current,
 			 keyboard->seat,
 			 WESTON_ACTIVATE_FLAG_CONFIGURE);