3 files changed, 10 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53b3561f..39b5e63a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,7 +189,11 @@ if (MSYS)
     if (NOT ENABLE_RESOURCE_EMBED)
         install (FILES ${EMB_BIN} DESTINATION .)
     endif ()
-    install (PROGRAMS ${SDL2_LIBDIR}/SDL2.dll DESTINATION .)
+    install (PROGRAMS
+        ${SDL2_LIBDIR}/SDL2.dll
+        res/urlopen.bat
+        DESTINATION .
+    )
     if (INSTALL_THE_FOUNDATION)
         install (PROGRAMS $<TARGET_FILE:the_Foundation::the_Foundation> DESTINATION .)
     endif ()
diff --git a/res/urlopen.bat b/res/urlopen.bat
new file mode 100644
index 00000000..82935824
--- /dev/null
+++ b/res/urlopen.bat
@@ -0,0 +1,2 @@
+@echo off
+start %1
diff --git a/src/app.c b/src/app.c
index 15eb96a9..285036cb 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1017,7 +1017,9 @@ void openInDefaultBrowser_App(const iString *url) {
                          iClob(newStringsCStr_StringList("/usr/bin/x-www-browser", cstr_String(url), NULL))
 #elif defined (iPlatformMsys)
         iClob(newStringsCStr_StringList(
-            "c:\\Windows\\System32\\cmd.exe", "/q", "/c", "start", cstr_String(url), NULL))
+            concatPath_CStr(cstr_String(execPath_App()), "../urlopen.bat"),
+            cstr_String(url),
+            NULL))
         /* TODO: Should consult environment variables to find the
            right cmd.exe. Also, the prompt window is shown momentarily... */
 #endif