diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/start_step.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/start_step.tsx
index b66a5653351bd..28d04750b80ba 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/start_step.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/start_step.tsx
@@ -106,6 +106,7 @@ export const StartStep: React.FC<StartStepProps> = ({
                     name="first"
                     value={rawName}
                     onChange={handleNameChange}
+                    disabled={!!connector}
                     onBlur={() => {
                       if (selectedConnector) {
                         generateConnectorName({
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/method_connector/new_connector_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/method_connector/new_connector_logic.ts
index da2dcb1198800..796a2a64ab56c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/method_connector/new_connector_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/method_connector/new_connector_logic.ts
@@ -143,9 +143,7 @@ export const NewConnectorLogic = kea<MakeLogicType<NewConnectorValues, NewConnec
       }
     },
     connectorNameGenerated: ({ connectorName }) => {
-      if (!values.rawName) {
-        actions.setRawName(connectorName);
-      }
+      actions.setRawName(connectorName);
     },
     createConnector: ({
       isSelfManaged,
@@ -191,7 +189,6 @@ export const NewConnectorLogic = kea<MakeLogicType<NewConnectorValues, NewConnec
     setSelectedConnector: ({ connector }) => {
       if (connector) {
         actions.generateConnectorName({
-          connectorName: values.rawName,
           connectorType: connector.serviceType,
         });
       }