diff --git a/src/xdisp.c b/src/xdisp.c
index cc0a689ba3..78f25af991 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -15658,7 +15658,13 @@ redisplay_internal (void)

   /* Build menubar and tool-bar items.  */
   if (NILP (Vmemory_full))
-    prepare_menu_bars ();
+    {
+      prepare_menu_bars ();
+
+      /* Once more taking into account the new tool bar height
+	 (Bug#46827).  */
+      do_pending_window_change (true);
+    }

   /* do_pending_window_change could change the selected_window due to
      frame resizing which makes the selected window too small.