diff --git a/modules/mono/SCsub b/modules/mono/SCsub
index 27e60c4623f..18a20ecac4e 100644
--- a/modules/mono/SCsub
+++ b/modules/mono/SCsub
@@ -84,12 +84,16 @@ def find_msbuild_unix(filename):
         hint_path = os.path.join(hint_dir, filename)
         if os.path.isfile(hint_path):
             return hint_path
+        elif os.path.isfile(hint_path + ".exe"):
+            return hint_path + ".exe"
 
     for hint_dir in os.environ["PATH"].split(os.pathsep):
         hint_dir = hint_dir.strip('"')
         hint_path = os.path.join(hint_dir, filename)
         if os.path.isfile(hint_path) and os.access(hint_path, os.X_OK):
             return hint_path
+        if os.path.isfile(hint_path + ".exe") and os.access(hint_path + ".exe", os.X_OK):
+            return hint_path + ".exe"
 
     return None
 
diff --git a/modules/mono/editor/godotsharp_builds.cpp b/modules/mono/editor/godotsharp_builds.cpp
index dbe0cc294c7..a26f36d64fc 100644
--- a/modules/mono/editor/godotsharp_builds.cpp
+++ b/modules/mono/editor/godotsharp_builds.cpp
@@ -53,6 +53,10 @@ String _find_build_engine_on_unix(const String &p_name) {
 	if (ret.length())
 		return ret;
 
+	String ret_fallback = path_which(p_name + ".exe");
+	if (ret_fallback.length())
+		return ret_fallback;
+
 	const char *locations[] = {
 #ifdef OSX_ENABLED
 		"/Library/Frameworks/Mono.framework/Versions/Current/bin/",