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 dd782b27..2245df36 100644
--- a/ui/desktop/src/components/settings_v2/extensions/modal/ExtensionModal.tsx
+++ b/ui/desktop/src/components/settings_v2/extensions/modal/ExtensionModal.tsx
@@ -108,7 +108,12 @@ export default function ExtensionModal({
         </p>
       </div>
       <Button
-        onClick={() => onDelete && onDelete(formData.name)}
+        onClick={() => {
+          if (onDelete) {
+            onDelete(formData.name);
+            onClose(); // Add this line to close the modal after deletion
+          }
+        }}
         className="w-full h-[60px] rounded-none border-b border-borderSubtle bg-transparent hover:bg-red-900/20 text-red-500 font-medium text-md"
       >
         <Trash2 className="h-4 w-4 mr-2" /> Confirm Delete
diff --git a/ui/desktop/src/components/settings_v2/models/subcomponents/AddModelModal.tsx b/ui/desktop/src/components/settings_v2/models/subcomponents/AddModelModal.tsx
index b26cadf3..42854c80 100644
--- a/ui/desktop/src/components/settings_v2/models/subcomponents/AddModelModal.tsx
+++ b/ui/desktop/src/components/settings_v2/models/subcomponents/AddModelModal.tsx
@@ -45,6 +45,7 @@ export const AddModelModal = ({ onClose, setView }: AddModelModalProps) => {
 
   const changeModel = async () => {
     await switchModel({ model: model, provider: provider, writeToConfig: upsert });
+    onClose(); // Add this line to close the modal after changing the model
   };
 
   useEffect(() => {