diff --git a/src/view/xdg-shell.cpp b/src/view/xdg-shell.cpp
index 2be1ceac7..d67fdcd1c 100644
--- a/src/view/xdg-shell.cpp
+++ b/src/view/xdg-shell.cpp
@@ -300,6 +300,7 @@ void wayfire_xdg_popup::destroy()
     on_new_popup.disconnect();
     on_ping_timeout.disconnect();
     on_reposition.disconnect();
+    popup->base->data = nullptr;
     popup = nullptr;
 }