diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c
index 9f2327b813..b336cecc59 100644
--- a/gdk/x11/gdkdrag-x11.c
+++ b/gdk/x11/gdkdrag-x11.c
@@ -1780,7 +1780,7 @@ gdk_drag_anim_timeout (gpointer data)
 
   t = ease_out_cubic (f);
 
-  gdk_surface_show (drag->drag_surface);
+  gdk_x11_surface_show (drag->drag_surface, FALSE);
   gdk_x11_surface_move (drag->drag_surface,
                         (drag->last_x - drag->hot_x) +
                         (drag->start_x - drag->last_x) * t,
@@ -2028,7 +2028,7 @@ _gdk_x11_surface_drag_begin (GdkSurface         *surface,
   x11_drag->ipc_surface = ipc_surface;
   if (gdk_x11_surface_get_group (surface))
     gdk_x11_surface_set_group (x11_drag->ipc_surface, surface);
-  gdk_surface_show (x11_drag->ipc_surface);
+  gdk_x11_surface_show (x11_drag->ipc_surface, FALSE);
 
   x11_drag->drag_surface = create_drag_surface (display);
 
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index b97913de6d..71f5d2e75e 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -230,6 +230,8 @@ void gdk_x11_surface_get_root_coords (GdkSurface *surface,
                                       gint       *root_x,
                                       gint       *root_y);
 
+void gdk_x11_surface_show (GdkSurface *surface,
+                           gboolean    already_mapped);
 void gdk_x11_surface_raise (GdkSurface *surface);
 void gdk_x11_surface_set_opacity (GdkSurface *surface,
                                   double      opacity);
diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index 79468a00dd..731d22e8ce 100644
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -1238,7 +1238,7 @@ set_initial_hints (GdkSurface *surface)
   toplevel->map_serial = NextRequest (xdisplay);
 }
 
-static void
+void
 gdk_x11_surface_show (GdkSurface *surface, gboolean already_mapped)
 {
   GdkDisplay *display;
@@ -3146,7 +3146,7 @@ gdk_x11_surface_unminimize (GdkSurface *surface)
 
   if (GDK_SURFACE_IS_MAPPED (surface))
     {  
-      gdk_surface_show (surface);
+      gdk_x11_surface_show (surface, TRUE);
       gdk_wmspec_change_state (FALSE, surface,
                                "_NET_WM_STATE_HIDDEN",
                                NULL);
@@ -4274,7 +4274,7 @@ create_moveresize_surface (MoveResizeData *mv_resize,
   g_assert (mv_resize->moveresize_emulation_surface == NULL);
 
   mv_resize->moveresize_emulation_surface = gdk_surface_new_temp (mv_resize->display, &rect);
-  gdk_surface_show (mv_resize->moveresize_emulation_surface);
+  gdk_x11_surface_show (mv_resize->moveresize_emulation_surface, FALSE);
 
   status = gdk_seat_grab (gdk_device_get_seat (mv_resize->device),
                           mv_resize->moveresize_emulation_surface,