diff --git a/build-mingw b/build-mingw
index 0c53ced24..6022e410a 100644
--- a/build-mingw
+++ b/build-mingw
@@ -65,6 +65,6 @@ pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
 echo Compiling DOSBox-X
 chmod +x configure
 # FIXME: I would like MinGW builds to enable the debugger, eventually
-./configure --enable-core-inline --enable-d3d9 --enable-d3d-shaders --prefix=/usr "$@" || exit 1
+./configure --enable-core-inline --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-mingw-sdl2 b/build-mingw-sdl2
index f72526857..518fad825 100644
--- a/build-mingw-sdl2
+++ b/build-mingw-sdl2
@@ -63,6 +63,6 @@ pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
 echo Compiling DOSBox-X
 chmod +x configure
 # FIXME: I would like MinGW builds to enable the debugger, eventually
-./configure --enable-core-inline --enable-d3d9 --enable-d3d-shaders --prefix=/usr --enable-sdl2 "$@" || exit 1
+./configure --enable-core-inline --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr --enable-sdl2 "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-mingw-sdldraw b/build-mingw-sdldraw
index 6d9b971f4..9af0b98c1 100644
--- a/build-mingw-sdldraw
+++ b/build-mingw-sdldraw
@@ -60,6 +60,6 @@ pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
 echo Compiling DOSBox-X
 chmod +x configure
 # FIXME: I would like MinGW builds to enable the debugger, eventually
-./configure --enable-core-inline --enable-force-menu-sdldraw --enable-d3d9 --enable-d3d-shaders --prefix=/usr "$@" || exit 1
+./configure --enable-core-inline --enable-force-menu-sdldraw --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
index 234f50a0d..a73d9244c 100644
--- a/src/gui/sdlmain.cpp
+++ b/src/gui/sdlmain.cpp
@@ -11869,14 +11869,14 @@ bool help_command_callback(DOSBoxMenu * const /*menu*/, DOSBoxMenu::item * const
 #if defined(C_SDL2)
     int x=-1, y=-1;
 #endif
-    if (!GFX_IsFullscreen()) {
+    if (!GFX_IsFullscreen()&&!window_was_maximized) {
         switchfs=true;
 #if defined(C_SDL2)
         SDL_GetWindowPosition(sdl.window, &x, &y);
 #endif
         GFX_SwitchFullScreen();
-        toscale=false;
     }
+    toscale=false;
     helpcmd = menuitem->get_name().substr(8);
     GUI_Shortcut(36);
     toscale=true;