diff --git a/CHANGELOG.md b/CHANGELOG.md
index da223299..57897ff5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 ### Changes from v2.0.6-release
 
 * Fixed `.` and `..` incorrectly being reported as files in remote Linux mounts
+* Fixed UI mount failure when path contains a space
 
 ## v2.0.6-release
 
diff --git a/repertory/repertory/src/ui/handlers.cpp b/repertory/repertory/src/ui/handlers.cpp
index 97b6e8f6..f71eeb24 100644
--- a/repertory/repertory/src/ui/handlers.cpp
+++ b/repertory/repertory/src/ui/handlers.cpp
@@ -728,7 +728,11 @@ auto handlers::launch_process(provider_type prov, std::string_view name,
     args.insert(std::next(args.begin(), 2U), "start");
     args.insert(std::next(args.begin(), 3U), "");
     args.insert(std::next(args.begin(), 4U), "/MIN");
-    args.insert(std::next(args.begin(), 5U), repertory_binary_);
+    if (utils::string::contains(repertory_binary_, " ")) {
+      args.insert(std::next(args.begin(), 5U), "\"" + repertory_binary_ + "\"");
+    } else {
+      args.insert(std::next(args.begin(), 5U), repertory_binary_);
+    }
 #else  // !defined(_WIN32)
     args.insert(args.begin(), "-f");
     args.insert(args.begin(), repertory_binary_);