diff --git a/MCPForUnity/Editor/Windows/Components/Settings/McpSettingsSection.cs b/MCPForUnity/Editor/Windows/Components/Settings/McpSettingsSection.cs
index 1489304..59a3bb6 100644
--- a/MCPForUnity/Editor/Windows/Components/Settings/McpSettingsSection.cs
+++ b/MCPForUnity/Editor/Windows/Components/Settings/McpSettingsSection.cs
@@ -28,6 +28,7 @@ namespace MCPForUnity.Editor.Windows.Components.Settings
         private Button clearUvxButton;
         private VisualElement uvxPathStatus;
         private TextField gitUrlOverride;
+        private Button browseGitUrlButton;
         private Button clearGitUrlButton;
         private TextField deploySourcePath;
         private Button browseDeploySourceButton;
@@ -76,6 +77,7 @@ namespace MCPForUnity.Editor.Windows.Components.Settings
             clearUvxButton = Root.Q<Button>("clear-uv-button");
             uvxPathStatus = Root.Q<VisualElement>("uv-path-status");
             gitUrlOverride = Root.Q<TextField>("git-url-override");
+            browseGitUrlButton = Root.Q<Button>("browse-git-url-button");
             clearGitUrlButton = Root.Q<Button>("clear-git-url-button");
             deploySourcePath = Root.Q<TextField>("deploy-source-path");
             browseDeploySourceButton = Root.Q<Button>("browse-deploy-source-button");
@@ -124,6 +126,8 @@ namespace MCPForUnity.Editor.Windows.Components.Settings
             browseUvxButton.clicked += OnBrowseUvxClicked;
             clearUvxButton.clicked += OnClearUvxClicked;
 
+            browseGitUrlButton.clicked += OnBrowseGitUrlClicked;
+
             gitUrlOverride.RegisterValueChangedCallback(evt =>
             {
                 string url = evt.newValue?.Trim();
@@ -147,6 +151,25 @@ namespace MCPForUnity.Editor.Windows.Components.Settings
                 OnHttpServerCommandUpdateRequested?.Invoke();
             };
 
+            deploySourcePath.RegisterValueChangedCallback(evt =>
+            {
+                string path = evt.newValue?.Trim();
+                if (string.IsNullOrEmpty(path) || path == "Not set")
+                {
+                    return;
+                }
+                
+                try
+                {
+                    MCPServiceLocator.Deployment.SetStoredSourcePath(path);
+                }
+                catch (Exception ex)
+                {
+                    EditorUtility.DisplayDialog("Invalid Source", ex.Message, "OK");
+                    UpdateDeploymentSection();
+                }
+            });
+
             browseDeploySourceButton.clicked += OnBrowseDeploySourceClicked;
             clearDeploySourceButton.clicked += OnClearDeploySourceClicked;
             deployButton.clicked += OnDeployClicked;
@@ -250,12 +273,25 @@ namespace MCPForUnity.Editor.Windows.Components.Settings
             McpLog.Info("uv path override cleared");
         }
 
+        private void OnBrowseGitUrlClicked()
+        {
+            string picked = EditorUtility.OpenFolderPanel("Select Server folder", string.Empty, string.Empty);
+            if (!string.IsNullOrEmpty(picked))
+            {
+                gitUrlOverride.value = picked;
+                EditorPrefs.SetString(EditorPrefKeys.GitUrlOverride, picked);
+                OnGitUrlChanged?.Invoke();
+                OnHttpServerCommandUpdateRequested?.Invoke();
+                McpLog.Info($"Server source override set to: {picked}");
+            }
+        }
+
         private void UpdateDeploymentSection()
         {
             var deployService = MCPServiceLocator.Deployment;
 
             string sourcePath = deployService.GetStoredSourcePath();
-            deploySourcePath.value = string.IsNullOrEmpty(sourcePath) ? "Not set" : sourcePath;
+            deploySourcePath.value = sourcePath ?? string.Empty;
 
             deployTargetLabel.text = $"Target: {deployService.GetTargetDisplayPath()}";
 
diff --git a/MCPForUnity/Editor/Windows/Components/Settings/McpSettingsSection.uxml b/MCPForUnity/Editor/Windows/Components/Settings/McpSettingsSection.uxml
index 80c2976..58f401e 100644
--- a/MCPForUnity/Editor/Windows/Components/Settings/McpSettingsSection.uxml
+++ b/MCPForUnity/Editor/Windows/Components/Settings/McpSettingsSection.uxml
@@ -35,6 +35,7 @@
                     </ui:VisualElement>
                     <ui:VisualElement class="path-override-controls">
                         <ui:TextField name="git-url-override" placeholder-text="/path/to/Server or git+https://..." class="override-field" />
+                        <ui:Button name="browse-git-url-button" text="Select" class="icon-button" />
                         <ui:Button name="clear-git-url-button" text="Clear" class="icon-button" />
                     </ui:VisualElement>
                     <ui:Label text="Examples:" class="help-text" style="margin-top: 5px;" />
@@ -47,7 +48,7 @@
                         <ui:Label text="MCP For Unity Source Folder:" class="override-label" />
                     </ui:VisualElement>
                     <ui:VisualElement class="path-override-controls">
-                        <ui:TextField name="deploy-source-path" readonly="true" class="override-field" />
+                        <ui:TextField name="deploy-source-path" class="override-field" />
                         <ui:Button name="browse-deploy-source-button" text="Select" class="icon-button" />
                         <ui:Button name="clear-deploy-source-button" text="Clear" class="icon-button" />
                     </ui:VisualElement>