diff --git a/master_changes.md b/master_changes.md
index 903e0ff2fd9..744a43379b9 100644
--- a/master_changes.md
+++ b/master_changes.md
@@ -68,6 +68,7 @@ users)
 ## External dependencies
   * Pass --symlink-type native to Cygwin setup if symlinks are available [#5830 @dra27]
   * Pass --no-version-check to Cygwin setup (suppresses a message box if setup needs updating) [#5830 @dra27]
+  * Pass --quiet-mode noinput to stop the user interrupting the setup GUI [#5830 @dra27]
 
 ## Format upgrade
   * Handle init OCaml `sys-ocaml-*` eval variables during format upgrade from 2.0 -> 2.1 -> 2.2 [#5829 @dra27]
diff --git a/src/state/opamSysInteract.ml b/src/state/opamSysInteract.ml
index cc4e75abfef..9d48d0f62d3 100644
--- a/src/state/opamSysInteract.ml
+++ b/src/state/opamSysInteract.ml
@@ -318,7 +318,7 @@ module Cygwin = struct
          "--no-startmenu";
          "--no-write-registry";
          "--no-version-check";
-         "--quiet-mode";
+         "--quiet-mode"; "noinput";
        ] @
          match packages with
          | [] -> []
@@ -973,7 +973,7 @@ let install_packages_commands_t ?(env=OpamVariable.Map.empty) config sys_package
        stored in `sys-pkg-manager-cmd` field *)
     [`AsUser (OpamFilename.to_string (Cygwin.cygsetup ())),
      [ "--root"; (OpamFilename.Dir.to_string (Cygwin.cygroot config));
-       "--quiet-mode";
+       "--quiet-mode"; "noinput";
        "--no-shortcuts";
        "--no-startmenu";
        "--no-desktop";