diff --git a/src/xfns.c b/src/xfns.c
index 276ea1c393..727b1fc059 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -861,6 +861,11 @@ x_set_parent_frame (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
 	(FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
 	 p ? FRAME_X_WINDOW (p) : DefaultRootWindow (FRAME_X_DISPLAY (f)),
 	 f->left_pos, f->top_pos);
+#ifdef USE_GTK
+      gtk_container_set_resize_mode
+	(GTK_CONTAINER (FRAME_GTK_OUTER_WIDGET (f)),
+	 p ? GTK_RESIZE_IMMEDIATE : GTK_RESIZE_QUEUE);
+#endif
       unblock_input ();

       fset_parent_frame (f, new_value);
@@ -4084,6 +4089,10 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame,
       block_input ();
       XReparentWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
 		       FRAME_X_WINDOW (p), f->left_pos, f->top_pos);
+#ifdef USE_GTK
+      gtk_container_set_resize_mode
+	(GTK_CONTAINER (FRAME_GTK_OUTER_WIDGET (f)), GTK_RESIZE_IMMEDIATE);
+#endif
       unblock_input ();
     }