diff --git a/src/xterm.c b/src/xterm.c
index 21d99f0c7b..02055f133f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10604,9 +10604,13 @@ x_set_offset (struct frame *f, register int xoff, register int yoff, int change_
     }

 #ifdef USE_GTK
-  /* Make sure we adjust for possible scaling.  */
-  gtk_window_move (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-		   modified_left / scale, modified_top / scale);
+  if (FRAME_PARENT_FRAME (f))
+    XMoveWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
+		 modified_left, modified_top);
+  else
+    /* Make sure we adjust for possible scaling.  */
+    gtk_window_move (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
+		     modified_left / scale, modified_top / scale);
 #else
   XMoveWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
 	       modified_left, modified_top);
@@ -11355,9 +11359,14 @@ x_set_window_size_1 (struct frame *f, bool change_gravity,
   int old_height = FRAME_PIXEL_HEIGHT (f);
   Lisp_Object fullscreen = get_frame_param (f, Qfullscreen);

-  if (change_gravity)
-    f->win_gravity = NorthWestGravity;
-  x_wm_set_size_hint (f, 0, false);
+
+  if (!FRAME_PARENT_FRAME (f))
+    {
+      if (change_gravity)
+	f->win_gravity = NorthWestGravity;
+
+      x_wm_set_size_hint (f, 0, false);
+    }

   /* When the frame is fullheight and we only want to change the width
      or it is fullwidth and we only want to change the height we should
@@ -11489,7 +11498,7 @@ x_set_window_size (struct frame *f, bool change_gravity,
     }

 #ifdef USE_GTK
-  if (FRAME_GTK_WIDGET (f))
+  if (FRAME_GTK_WIDGET (f) && !FRAME_PARENT_FRAME (f))
     xg_frame_set_char_size (f, width, height);
   else
     x_set_window_size_1 (f, change_gravity, width, height);