diff --git a/repertory/repertory/src/ui/handlers.cpp b/repertory/repertory/src/ui/handlers.cpp
index c6f961aa..56d25d06 100644
--- a/repertory/repertory/src/ui/handlers.cpp
+++ b/repertory/repertory/src/ui/handlers.cpp
@@ -262,7 +262,7 @@ void handlers::handle_post_mount(auto &&req, auto &&res) const {
   if (unmount) {
     read_process(prov, name, "-unmount");
   } else {
-    read_process(prov, name, fmt::format("\"{}\"", location));
+    read_process(prov, name, fmt::format(R"("{}")", location));
   }
 
   res.status = http_error_codes::ok;
@@ -275,7 +275,7 @@ void handlers::handle_put_set_value_by_name(auto &&req, auto &&res) {
   auto value = req.get_param_value("value");
 
 #if defined(_WIN32)
-  read_process(prov, name, fmt::format("-set {} \"{}\"", key, value));
+  read_process(prov, name, fmt::format(R"(-set {} "{}")", key, value));
 #else  //! defined(_WIN32)
   read_process(prov, name, fmt::format("-set {} '{}'", key, value));
 #endif // defined(_WIN32)
diff --git a/web/repertory/lib/widgets/mount_widget.dart b/web/repertory/lib/widgets/mount_widget.dart
index 688674d1..4cc7262f 100644
--- a/web/repertory/lib/widgets/mount_widget.dart
+++ b/web/repertory/lib/widgets/mount_widget.dart
@@ -68,7 +68,7 @@ class _MountWidgetState extends State<MountWidget> {
                           _enabled = false;
                         });
 
-                        String? location;
+                        String? location = mount.path;
                         if (!isActive && mount.path.isEmpty) {
                           location = await mount.getMountLocation();
                           if (location == null) {}