diff --git a/src/libs/gocmdbridge/client/cmdbridgeclient.cpp b/src/libs/gocmdbridge/client/cmdbridgeclient.cpp
index a52136d22aa..a88ab332bcd 100644
--- a/src/libs/gocmdbridge/client/cmdbridgeclient.cpp
+++ b/src/libs/gocmdbridge/client/cmdbridgeclient.cpp
@@ -920,7 +920,10 @@ expected_str<FilePath> Client::getCmdBridgePath(
     const QString type = typeToString.value(osType);
     const QString arch = archToString.value(osArch);
 
-    const QString cmdBridgeName = QStringLiteral("cmdbridge-%1-%2").arg(type, arch);
+    QString cmdBridgeName = QStringLiteral("cmdbridge-%1-%2").arg(type, arch);
+
+    if (osType == OsType::OsTypeWindows)
+        cmdBridgeName += QStringLiteral(".exe");
 
     const FilePath result = libExecPath.resolvePath(cmdBridgeName);
     if (result.exists())
diff --git a/src/libs/gocmdbridge/server/CMakeLists.txt b/src/libs/gocmdbridge/server/CMakeLists.txt
index bc4ef75f258..a5462076546 100644
--- a/src/libs/gocmdbridge/server/CMakeLists.txt
+++ b/src/libs/gocmdbridge/server/CMakeLists.txt
@@ -8,6 +8,10 @@ function(go_build NAME SOURCES PLATFORMS ARCHITECTURES LDFLAGS)
             set(TARGET_NAME ${NAME}-${PLATFORM}-${ARCHITECTURE})
             set(OUTPUT ${OUTPUT_FOLDER}/${TARGET_NAME})
 
+            if (${PLATFORM} STREQUAL "windows")
+                string(APPEND OUTPUT ".exe")
+            endif()
+
             if ((${PLATFORM} STREQUAL "linux" OR (${PLATFORM} STREQUAL "windows" AND ${ARCHITECTURE} STREQUAL "amd64")) AND NOT UPX_BIN STREQUAL "UPX_BIN-NOTFOUND")
                 add_custom_command(
                     OUTPUT "${OUTPUT}"