diff --git a/src/wayland/meta-wayland-inhibit-shortcuts-dialog.c b/src/wayland/meta-wayland-inhibit-shortcuts-dialog.c
index 207c6b1c7..6ae1eb8ff 100644
--- a/src/wayland/meta-wayland-inhibit-shortcuts-dialog.c
+++ b/src/wayland/meta-wayland-inhibit-shortcuts-dialog.c
@@ -51,14 +51,23 @@ surface_inhibit_shortcuts_data_set (MetaWaylandSurface   *surface,
 }
 
 static void
-surface_inhibit_shortcuts_data_free (MetaWaylandSurface   *surface,
-                                     InhibitShortcutsData *data)
+surface_inhibit_shortcuts_data_free (InhibitShortcutsData *data)
 {
   meta_inhibit_shortcuts_dialog_hide (data->dialog);
 
   g_free (data);
 }
 
+static void
+on_surface_destroyed (MetaWaylandSurface   *surface,
+                      InhibitShortcutsData *data)
+{
+  surface_inhibit_shortcuts_data_free (data);
+  g_object_set_qdata (G_OBJECT (surface),
+                      quark_surface_inhibit_shortcuts_data,
+                      NULL);
+}
+
 static void
 surface_inhibit_shortcuts_dialog_free (gpointer  ptr,
                                        GClosure *closure)
@@ -98,15 +107,15 @@ meta_wayland_surface_ensure_inhibit_shortcuts_dialog (MetaWaylandSurface *surfac
   MetaInhibitShortcutsDialog *dialog;
 
   data = surface_inhibit_shortcuts_data_get (surface);
-  if (data == NULL)
-    {
-      data = g_new (InhibitShortcutsData, 1);
-      surface_inhibit_shortcuts_data_set (surface, data);
-    }
-  else if (data->dialog != NULL)
-     /* There is a dialog already created, nothing to do */
+  if (data)
     return data;
 
+  data = g_new (InhibitShortcutsData, 1);
+  surface_inhibit_shortcuts_data_set (surface, data);
+  g_signal_connect (surface, "destroy",
+                    G_CALLBACK (on_surface_destroyed),
+                    data);
+
   window = meta_wayland_surface_get_toplevel_window (surface);
   display = window->display;
   dialog =
@@ -122,10 +131,6 @@ meta_wayland_surface_ensure_inhibit_shortcuts_dialog (MetaWaylandSurface *surfac
                          data, surface_inhibit_shortcuts_dialog_free,
                          0);
 
-  g_signal_connect (surface, "destroy",
-                    G_CALLBACK (surface_inhibit_shortcuts_data_free),
-                    data);
-
   return data;
 }