diff --git a/src/widget.c b/src/widget.c
index 43c8fa7185f..e767b006e3f 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -392,7 +392,9 @@ EmacsFrameRealize (Widget widget, XtValueMask *mask,
   attrs->event_mask = (STANDARD_EVENT_SET
 		       | PropertyChangeMask
 		       | SubstructureNotifyMask);
+  attrs->bit_gravity = NorthWestGravity;
   *mask |= CWEventMask;
+  *mask |= CWBitGravity;
   XtCreateWindow (widget, InputOutput, (Visual *) CopyFromParent, *mask,
 		  attrs);
   /* Some ConfigureNotify events does not end up in EmacsFrameResize so
diff --git a/src/xfns.c b/src/xfns.c
index 87ce3af30d7..33ec8312cb5 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4483,7 +4483,7 @@ x_window (struct frame *f)
 
   attributes.background_pixel = FRAME_BACKGROUND_PIXEL (f);
   attributes.border_pixel = f->output_data.x->border_pixel;
-  attributes.bit_gravity = StaticGravity;
+  attributes.bit_gravity = NorthWestGravity;
   attributes.backing_store = NotUseful;
   attributes.save_under = True;
   attributes.event_mask = STANDARD_EVENT_SET;