diff --git a/windows/src/desktop/setup/UfrmRunDesktop.dfm b/windows/src/desktop/setup/UfrmRunDesktop.dfm
index e16c3d7d72..b5b80ea03b 100644
--- a/windows/src/desktop/setup/UfrmRunDesktop.dfm
+++ b/windows/src/desktop/setup/UfrmRunDesktop.dfm
@@ -615,4 +615,9 @@ object frmRunDesktop: TfrmRunDesktop
       OnClick = cbLanguageClick
     end
   end
+  object appevents: TApplicationEvents
+    OnMessage = appeventsMessage
+    Left = 336
+    Top = 184
+  end
 end
diff --git a/windows/src/desktop/setup/UfrmRunDesktop.pas b/windows/src/desktop/setup/UfrmRunDesktop.pas
index 6093e58a59..f184f641f5 100644
--- a/windows/src/desktop/setup/UfrmRunDesktop.pas
+++ b/windows/src/desktop/setup/UfrmRunDesktop.pas
@@ -51,6 +51,7 @@ uses
   System.SysUtils,
   System.UITypes,
   System.Variants,
+  Vcl.AppEvnts,
   Vcl.ComCtrls,
   Vcl.Controls,
   Vcl.Dialogs,
@@ -81,6 +82,7 @@ type
     lblActions: TLabel;
     cbLanguage: TComboBox;
     lblGlobe: TLabel;
+    appevents: TApplicationEvents;
     procedure URLLabelMouseEnter(Sender: TObject);
     procedure URLLabelMouseLeave(Sender: TObject);
     procedure lblOptionsClick(Sender: TObject);
@@ -91,6 +93,7 @@ type
     procedure lblLicenseClick(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure cbLanguageClick(Sender: TObject);
+    procedure appeventsMessage(var Msg: tagMSG; var Handled: Boolean);
   private
     g_iCurPos, g_iProgress, g_iProgressTotal: Integer;
     g_bCancelInstall, g_bScriptInProgress, g_bForwardProgress, g_bFirstTime, g_bEnableActionData: Boolean;
@@ -712,6 +715,17 @@ begin
   (Sender as TLabel).Font.Style := [fsUnderline];
 end;
 
+procedure TfrmRunDesktop.appeventsMessage(var Msg: tagMSG;
+  var Handled: Boolean);
+begin
+  if (Msg.message = WM_SYSCOMMAND) and (Msg.wParam = SC_RESTORE) then
+  begin
+    // Handle the case where Win+M pressed, window never restores
+    // Only really happens with Splash.
+    PostMessage(Handle, WM_SHOWWINDOW, 1, SW_PARENTOPENING);
+  end;
+end;
+
 procedure TfrmRunDesktop.BackupKey(Root: HKEY; Path: WideString); // I2642
 var
   regRead: TRegistryErrorControlled;  // I2890