1 files changed, 6 insertions, 0 deletions

diff --git a/src/xfns.c b/src/xfns.c
index 4e3144e5dc4..b3c2731c7d1 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1908,12 +1908,18 @@ x_window (f, window_prompting, minibuffer_only)
     char *tem, shell_position[32];
     Arg al[2];
     int ac = 0;
+    int ibw;
     int menubar_size 
       = (f->display.x->menubar_widget
          ? (f->display.x->menubar_widget->core.height
             + f->display.x->menubar_widget->core.border_width)
          : 0);
 
+    XtVaGetValues (pane_widget,
+                   XtNinternalBorderWidth, &ibw,
+                   NULL);
+    menubar_size += ibw;
+
     if (window_prompting & USPosition)
       {
         int left = f->display.x->left_pos;