diff --git a/src/win/win.c b/src/win/win.c
index 7d127efa6..801c32ca5 100644
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -1135,12 +1135,15 @@ plat_setfullscreen(int on)
 			ResizeWindowByClientArea(hwndMain, temp_x, temp_y + (hide_status_bar ? 0 : sbar_height) + (hide_tool_bar ? 0 : tbar_height));
 		}
 
+		/* Toolbar. */
+		MoveWindow(hwndRebar, 0, 0, temp_x, tbar_height, TRUE);
+
 		/* Render window. */
-		MoveWindow(hwndRender, 0, 0, temp_x, temp_y, TRUE);
+		MoveWindow(hwndRender, 0, hide_tool_bar ? 0 : tbar_height, temp_x, temp_y, TRUE);
 		GetWindowRect(hwndRender, &rect);
 
 		/* Status bar. */
-		MoveWindow(hwndSBAR, 0, rect.bottom, temp_x, 17, TRUE);
+		MoveWindow(hwndSBAR, 0, rect.bottom, temp_x, sbar_height, TRUE);
 
 		if (mouse_capture)
 			ClipCursor(&rect);
diff --git a/src/win/win_ui.c b/src/win/win_ui.c
index 099540ccb..92fccd1c3 100644
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -1419,10 +1419,7 @@ ui_init(int nCmdShow)
 		scrnsz_x = fixed_size_x;
 		scrnsz_y = fixed_size_y;
 	}
-	if (hide_status_bar)
-		ResizeWindowByClientArea(hwndMain, scrnsz_x, scrnsz_y);
-	else
-		ResizeWindowByClientArea(hwndMain, scrnsz_x, scrnsz_y + sbar_height);
+	ResizeWindowByClientArea(hwnd, scrnsz_x, scrnsz_y + (hide_status_bar ? 0 : sbar_height) + (hide_tool_bar ? 0 : tbar_height));
     }
 
     /* Load the desired language */