diff --git a/src/wayland/xdg/toplevel.rs b/src/wayland/xdg/toplevel.rs
index 72c25ae..5ad7088 100644
--- a/src/wayland/xdg/toplevel.rs
+++ b/src/wayland/xdg/toplevel.rs
@@ -148,11 +148,10 @@ impl Toplevel {
 				.collect(),
 		)
 		.await?;
-		self.xdg_surface
-			.upgrade()
-			.unwrap()
-			.reconfigure(client)
-			.await
+		if let Some(xdg_surface) = self.xdg_surface.upgrade() {
+			xdg_surface.reconfigure(client).await?;
+		}
+		Ok(())
 	}
 }
 impl XdgToplevel for Toplevel {