diff --git a/frontend/src/components/custom-tools/add-llm-profile/AddLlmProfile.jsx b/frontend/src/components/custom-tools/add-llm-profile/AddLlmProfile.jsx
index a020540b26..bac0e5325f 100644
--- a/frontend/src/components/custom-tools/add-llm-profile/AddLlmProfile.jsx
+++ b/frontend/src/components/custom-tools/add-llm-profile/AddLlmProfile.jsx
@@ -64,10 +64,6 @@ function AddLlmProfile({
 
   useEffect(() => {
     setAdaptorProfilesDropdown();
-
-    return () => {
-      setEditLlmProfileId(null);
-    };
   }, []);
 
   // Load retrieval strategies when tool_id is available (only once)
@@ -163,7 +159,7 @@ function AddLlmProfile({
 
   useEffect(() => {
     if (resetForm) {
-      form.resetFields();
+      form.setFieldsValue(formDetails);
       setResetForm(false);
     }
   }, [formDetails]);
diff --git a/frontend/src/components/custom-tools/manage-llm-profiles/ManageLlmProfiles.jsx b/frontend/src/components/custom-tools/manage-llm-profiles/ManageLlmProfiles.jsx
index 3bb80d6cb2..15d2263f60 100644
--- a/frontend/src/components/custom-tools/manage-llm-profiles/ManageLlmProfiles.jsx
+++ b/frontend/src/components/custom-tools/manage-llm-profiles/ManageLlmProfiles.jsx
@@ -166,6 +166,7 @@ function ManageLlmProfiles() {
   }, [llmProfiles, defaultLlmProfile]);
 
   const handleAddNewLlmProfileBtnClick = () => {
+    setEditLlmProfileId(null);
     setIsAddLlm(true);
 
     try {
diff --git a/frontend/src/components/settings/settings/Settings.css b/frontend/src/components/settings/settings/Settings.css
index 5a08144c99..d89b9291b5 100644
--- a/frontend/src/components/settings/settings/Settings.css
+++ b/frontend/src/components/settings/settings/Settings.css
@@ -34,7 +34,6 @@
 }
 
 .settings-menu-item:first-child {
-  font-weight: 600;
   margin-bottom: 4px;
 }