diff --git a/internal/cli/cli.go b/internal/cli/cli.go
index 7dd074017..c91f02d6c 100644
--- a/internal/cli/cli.go
+++ b/internal/cli/cli.go
@@ -545,7 +545,7 @@ func envCommand(logger *log.Logger, shimmedCommand string, args []string) error
 }
 
 func setPath(paths []string) string {
-	return strings.Join(paths, ":") + ":" + os.Getenv("PATH")
+	return strings.Join(paths, string(os.PathListSeparator)) + string(os.PathListSeparator) + os.Getenv("PATH")
 }
 
 func execCommand(logger *log.Logger, command string, args []string) error {
diff --git a/internal/paths/paths.go b/internal/paths/paths.go
index 237871dd2..c6d1cbb7a 100644
--- a/internal/paths/paths.go
+++ b/internal/paths/paths.go
@@ -4,6 +4,7 @@
 package paths
 
 import (
+	"path/filepath"
 	"strings"
 )
 
@@ -11,11 +12,11 @@ import (
 func RemoveFromPath(currentPath, pathToRemove string) string {
 	var newPaths []string
 
-	for _, fspath := range strings.Split(currentPath, ":") {
+	for _, fspath := range filepath.SplitList(currentPath) {
 		if fspath != pathToRemove {
 			newPaths = append(newPaths, fspath)
 		}
 	}
 
-	return strings.Join(newPaths, ":")
+	return strings.Join(newPaths, string(filepath.ListSeparator))
 }