diff --git a/ui/desktop/src/components/ConfigContext.tsx b/ui/desktop/src/components/ConfigContext.tsx
index 2d1c0581..6eaf2231 100644
--- a/ui/desktop/src/components/ConfigContext.tsx
+++ b/ui/desktop/src/components/ConfigContext.tsx
@@ -19,6 +19,7 @@ import type {
   ExtensionQuery,
   ExtensionConfig,
 } from '../api/types.gen';
+import { removeShims } from './settings_v2/extensions/utils';
 
 // Define a local version that matches the structure of the imported one
 export type FixedExtensionEntry = ExtensionConfig & {
@@ -118,6 +119,10 @@ export const ConfigProvider: React.FC<ConfigProviderProps> = ({ children }) => {
   };
 
   const addExtension = async (name: string, config: ExtensionConfig, enabled: boolean) => {
+    // remove shims if present
+    if (config.type == 'stdio') {
+      config.cmd = removeShims(config.cmd);
+    }
     const query: ExtensionQuery = { name, config, enabled };
     await apiAddExtension({
       body: query,
diff --git a/ui/desktop/src/components/settings_v2/extensions/modal/ExtensionModal.tsx b/ui/desktop/src/components/settings_v2/extensions/modal/ExtensionModal.tsx
index 2245df36..1715de5a 100644
--- a/ui/desktop/src/components/settings_v2/extensions/modal/ExtensionModal.tsx
+++ b/ui/desktop/src/components/settings_v2/extensions/modal/ExtensionModal.tsx
@@ -96,6 +96,7 @@ export default function ExtensionModal({
     if (isFormValid()) {
       onSubmit(formData);
     }
+    onClose();
   };
 
   // Create footer buttons based on current state