diff --git a/win/win32/mhmap.c b/win/win32/mhmap.c
index 5a3c2e1b2..69c612c26 100644
--- a/win/win32/mhmap.c
+++ b/win/win32/mhmap.c
@@ -302,6 +302,8 @@ int mswin_map_mode(HWND hWnd, int mode)
 
 	mswin_map_stretch(hWnd, &mapSize, TRUE);
 
+	mswin_update_inventory(); /* for perm_invent to hide/show tiles */ 
+
 	return oldMode;
 }
 
diff --git a/win/win32/mhmenu.c b/win/win32/mhmenu.c
index c9c64f08b..c39b74656 100644
--- a/win/win32/mhmenu.c
+++ b/win/win32/mhmenu.c
@@ -1459,10 +1459,10 @@ void mswin_menu_window_size (HWND hWnd, LPSIZE sz)
 		extra_cx = (wrt.right-wrt.left) - sz->cx;
 
 		if( data->type==MENU_TYPE_MENU ) {
-			sz->cx = max(sz->cx, data->menu.menu_cx + GetSystemMetrics(SM_CXVSCROLL) );
+			sz->cx = data->menu.menu_cx + GetSystemMetrics(SM_CXVSCROLL);
 		} else {
 			/* Use the width of the text box */
-			sz->cx = max( sz->cx, data->text.text_box_size.cx + 2*GetSystemMetrics(SM_CXVSCROLL));
+			sz->cx = data->text.text_box_size.cx + 2*GetSystemMetrics(SM_CXVSCROLL);
 		}
 		sz->cx += extra_cx;
 	} else {