diff --git a/src/wayland/xdg/backend.rs b/src/wayland/xdg/backend.rs
index 1461341..8249440 100644
--- a/src/wayland/xdg/backend.rs
+++ b/src/wayland/xdg/backend.rs
@@ -70,7 +70,7 @@ impl XdgBackend {
 			return;
 		};
 
-		if let Some(mut child) = self.children.get_mut(&id) {
+		if let Some(mut child) = self.children.get_mut(id) {
 			child.1.geometry = geometry;
 		}
 		let Some(panel_item) = self.panel_item() else {
diff --git a/src/wayland/xdg/popup.rs b/src/wayland/xdg/popup.rs
index 773001e..9f0b569 100644
--- a/src/wayland/xdg/popup.rs
+++ b/src/wayland/xdg/popup.rs
@@ -8,10 +8,7 @@ use crate::{
 };
 use parking_lot::Mutex;
 use rand::Rng;
-use std::sync::{
-	Arc,
-	atomic::{AtomicBool, Ordering},
-};
+use std::sync::Arc;
 use waynest::{
 	server::{Client, Dispatcher, Result, protocol::stable::xdg_shell::xdg_popup::XdgPopup},
 	wire::ObjectId,
@@ -25,7 +22,6 @@ pub struct Popup {
 	pub surface: Arc<Surface>,
 	positioner_data: Mutex<PositionerData>,
 	geometry: DoubleBuffer<Geometry>,
-	mapped: AtomicBool,
 }
 impl Popup {
 	pub fn new(
@@ -48,7 +44,6 @@ impl Popup {
 			surface,
 			positioner_data: Mutex::new(positioner_data),
 			geometry: DoubleBuffer::new(positioner_data.infinite_geometry()),
-			mapped: AtomicBool::new(false),
 		}
 	}
 }
@@ -106,9 +101,6 @@ impl XdgPopup for Popup {
 }
 impl Drop for Popup {
 	fn drop(&mut self) {
-		if !self.mapped.load(Ordering::Relaxed) {
-			return;
-		}
 		let Some(panel_item) = self.surface.wl_surface.panel_item.lock().upgrade() else {
 			return;
 		};