diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index d9856d8b5e..9c58c36f1b 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6324,6 +6324,10 @@ gtk_window_unexport_handle (GtkWindow *window)
       return;
     }
 #endif
+#ifdef GDK_WINDOWING_X11
+  if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
+    return;
+#endif
 
   g_warning ("Couldn't unexport handle for %s surface, unsupported windowing system",
              G_OBJECT_TYPE_NAME (priv->surface));