diff --git a/ui/src/components/Secrets/ExternalSecrets/ListSecretsStore.tsx b/ui/src/components/Secrets/ExternalSecrets/ListSecretsStore.tsx
index f98de9ce84..3ffb470fc4 100644
--- a/ui/src/components/Secrets/ExternalSecrets/ListSecretsStore.tsx
+++ b/ui/src/components/Secrets/ExternalSecrets/ListSecretsStore.tsx
@@ -6,27 +6,31 @@ import { Select } from '../../../utils/form';
 
 const ListSecretsStore = ({
   value,
-  validateForm,
+  hasError,
   handleFormData,
   clusterName,
 }: {
   value: string;
-  validateForm: boolean;
+  hasError: boolean;
   handleFormData: (value: any) => void;
   clusterName: string;
 }) => {
-  const { data, isLoading, error } = useListExternalSecretStores({
+  const {
+    data,
+    isLoading,
+    error: listError,
+  } = useListExternalSecretStores({
     clusterName,
   });
   return (
-    <RequestStateHandler loading={isLoading} error={error as RequestError}>
+    <RequestStateHandler loading={isLoading} error={listError as RequestError}>
       <Select
         required
         name="secretStoreRef"
         label="SECRET STORE"
         onChange={event => handleFormData(event.target.value)}
         value={value}
-        error={validateForm && !value}
+        error={hasError}
       >
         {data?.stores?.length ? (
           data?.stores?.map((s, index: number) => {
diff --git a/ui/src/components/Secrets/ExternalSecrets/SecretProperty.tsx b/ui/src/components/Secrets/ExternalSecrets/SecretProperty.tsx
index 6133ced855..0647a17fe7 100644
--- a/ui/src/components/Secrets/ExternalSecrets/SecretProperty.tsx
+++ b/ui/src/components/Secrets/ExternalSecrets/SecretProperty.tsx
@@ -14,12 +14,12 @@ const PropertiesSwitch = styled(Switch)`
 
 export const SecretProperty = ({
   formData,
-  validateForm,
   setFormData,
+  formError,
 }: {
   formData: ExternalSecret;
-  validateForm: boolean;
   setFormData: Dispatch<React.SetStateAction<any>>;
+  formError: string;
 }) => {
   const handleSecretChange = (id: number, isKey: boolean, value: string) => {
     setFormData((f: ExternalSecret) => ({
@@ -80,7 +80,7 @@ export const SecretProperty = ({
                 placeholder="Secret Property"
                 value={obj.key}
                 handleFormData={val => handleSecretChange(obj.id, true, val)}
-                error={validateForm && !obj.key}
+                formError={formError}
               />
               <InputDebounced
                 name="dataSecretValue"
diff --git a/ui/src/components/Secrets/ExternalSecrets/index.tsx b/ui/src/components/Secrets/ExternalSecrets/index.tsx
index 5929020c58..6e07546d02 100644
--- a/ui/src/components/Secrets/ExternalSecrets/index.tsx
+++ b/ui/src/components/Secrets/ExternalSecrets/index.tsx
@@ -37,7 +37,6 @@ const CreateExternalSecret = () => {
   const [showAuthDialog, setShowAuthDialog] = useState(false);
 
   const [formError, setFormError] = useState<string>('');
-  const [validateForm, setValidateForm] = useState<boolean>(false);
   const [formData, setFormData] = useState<ExternalSecret>(initialFormData);
   const handleFormData = (value: any, key: string) => {
     setFormData(f => ({ ...f, [key]: value }));
@@ -137,10 +136,9 @@ const CreateExternalSecret = () => {
         <NotificationsWrapper>
           <FormWrapperSecret
             noValidate
-            onSubmit={event => {
-              setValidateForm(true);
-              validateFormData(event, handleCreateSecret, setFormError);
-            }}
+            onSubmit={event =>
+              validateFormData(event, handleCreateSecret, setFormError)
+            }
           >
             <InputDebounced
               required
@@ -148,7 +146,7 @@ const CreateExternalSecret = () => {
               label="EXTERNAL SECRET NAME"
               value={formData.secretName}
               handleFormData={val => handleFormData(val, 'secretName')}
-              error={validateForm && !formData.secretName}
+              formError={formError}
             />
             <InputDebounced
               required
@@ -156,24 +154,26 @@ const CreateExternalSecret = () => {
               label="TARGET K8s SECRET NAME"
               value={formData.dataSecretKey}
               handleFormData={val => handleFormData(val, 'dataSecretKey')}
-              error={validateForm && !formData.dataSecretKey}
+              formError={formError}
             />
             <Flex column>
               <ListClusters
                 value={formData.clusterName}
-                validateForm={validateForm}
                 handleFormData={(val: any) => {
                   handleFormData(val, 'clusterName');
                   handleFormData('', 'secretStoreRef');
                 }}
+                hasError={formError === 'clusterName' && !formData.clusterName}
               />
             </Flex>
             {formData.clusterName && (
               <ListSecretsStore
-                validateForm={validateForm}
                 value={formData.secretStore}
                 handleFormData={(val: any) => handleSecretStoreChange(val)}
                 clusterName={formData.clusterName}
+                hasError={
+                  formError === 'secretStoreRef' && !formData.secretStore
+                }
               />
             )}
             {formData.secretStore && (
@@ -187,7 +187,7 @@ const CreateExternalSecret = () => {
                     return;
                   }}
                   disabled={true}
-                  error={validateForm && !formData.secretStoreType}
+                  formError={formError}
                 />
                 <InputDebounced
                   required
@@ -199,7 +199,7 @@ const CreateExternalSecret = () => {
                     !!formData.secretNamespace &&
                     formData.defaultSecretNamespace === formData.secretNamespace
                   }
-                  error={validateForm && !formData.secretNamespace}
+                  formError={formError}
                 />
               </Flex>
             )}
@@ -209,12 +209,12 @@ const CreateExternalSecret = () => {
               label="SECRET PATH"
               value={formData.secretPath}
               handleFormData={val => handleFormData(val, 'secretPath')}
-              error={validateForm && !formData.secretPath}
+              formError={formError}
             />
             <SecretProperty
               formData={formData}
               setFormData={setFormData}
-              validateForm={validateForm}
+              formError={formError}
             />
             <GitOps
               loading={loading}
diff --git a/ui/src/components/Secrets/SOPS/SecretData.tsx b/ui/src/components/Secrets/SOPS/SecretData.tsx
index 2c7f2a972f..99cdcb03b4 100644
--- a/ui/src/components/Secrets/SOPS/SecretData.tsx
+++ b/ui/src/components/Secrets/SOPS/SecretData.tsx
@@ -6,12 +6,12 @@ import { ExternalSecret, SOPS } from '../Shared/utils';
 
 const data = ({
   formData,
-  validateForm,
   setFormData,
+  formError,
 }: {
   formData: SOPS | ExternalSecret;
-  validateForm: boolean;
   setFormData: Dispatch<React.SetStateAction<any>>;
+  formError: string;
 }) => {
   const handleSecretChange = (id: number, isKey: boolean, value: string) => {
     setFormData((f: ExternalSecret) => ({
@@ -58,7 +58,7 @@ const data = ({
             placeholder="Secret key"
             value={obj.key}
             handleFormData={val => handleSecretChange(obj.id, true, val)}
-            error={validateForm && !obj.key}
+            formError={formError}
           />
           <InputDebounced
             required
@@ -67,7 +67,7 @@ const data = ({
             placeholder="secret value"
             value={obj.value}
             handleFormData={val => handleSecretChange(obj.id, false, val)}
-            error={validateForm && !obj.value}
+            formError={formError}
           />
           {formData.data.length > 1 && (
             <RemoveCircleOutlineIcon
diff --git a/ui/src/components/Secrets/SOPS/index.tsx b/ui/src/components/Secrets/SOPS/index.tsx
index 9a522f9573..c5497857ea 100644
--- a/ui/src/components/Secrets/SOPS/index.tsx
+++ b/ui/src/components/Secrets/SOPS/index.tsx
@@ -39,7 +39,6 @@ const CreateSOPS = () => {
   const [showAuthDialog, setShowAuthDialog] = useState(false);
 
   const [formError, setFormError] = useState<string>('');
-  const [validateForm, setValidateForm] = useState<boolean>(false);
   const [formData, setFormData] = useState<SOPS>(initialFormData);
   const handleFormData = (value: any, key: string) => {
     setFormData(f => ({ ...f, [key]: value }));
@@ -137,19 +136,18 @@ const CreateSOPS = () => {
         <NotificationsWrapper>
           <FormWrapperSecret
             noValidate
-            onSubmit={event => {
-              setValidateForm(true);
-              validateFormData(event, handleCreateSecret, setFormError);
-            }}
+            onSubmit={event =>
+              validateFormData(event, handleCreateSecret, setFormError)
+            }
           >
             <Flex column>
               <ListClusters
                 value={formData.clusterName}
-                validateForm={validateForm}
                 handleFormData={(val: any) => {
                   handleFormData(val, 'clusterName');
                   handleFormData('', 'kustomization');
                 }}
+                hasError={formError === 'clusterName' && !formData.clusterName}
               />
               <InputDebounced
                 required
@@ -157,7 +155,7 @@ const CreateSOPS = () => {
                 label="SECRET NAME"
                 value={formData.secretName}
                 handleFormData={val => handleFormData(val, 'secretName')}
-                error={validateForm && !formData.secretName}
+                formError={formError}
               />
               <InputDebounced
                 required
@@ -165,7 +163,7 @@ const CreateSOPS = () => {
                 label="SECRET NAMESPACE"
                 value={formData.secretNamespace}
                 handleFormData={val => handleFormData(val, 'secretNamespace')}
-                error={validateForm && !formData.secretNamespace}
+                formError={formError}
               />
             </Flex>
             <h2>Encryption</h2>
@@ -182,12 +180,14 @@ const CreateSOPS = () => {
             </Select>
             {!!formData.clusterName && (
               <ListKustomizations
-                validateForm={validateForm}
                 value={formData.kustomization}
                 handleFormData={(val: any) =>
                   handleFormData(val, 'kustomization')
                 }
                 clusterName={formData.clusterName}
+                hasError={
+                  formError === 'kustomization' && !formData.kustomization
+                }
               />
             )}
             <h2>Secret Data</h2>
@@ -198,7 +198,7 @@ const CreateSOPS = () => {
             <SecretData
               formData={formData}
               setFormData={setFormData}
-              validateForm={validateForm}
+              formError={formError}
             />
             <GitOps
               loading={loading}
diff --git a/ui/src/components/Secrets/Shared/ListClusters.tsx b/ui/src/components/Secrets/Shared/ListClusters.tsx
index 409160b90a..654a18405a 100644
--- a/ui/src/components/Secrets/Shared/ListClusters.tsx
+++ b/ui/src/components/Secrets/Shared/ListClusters.tsx
@@ -6,23 +6,23 @@ import { Select } from '../../../utils/form';
 
 const ListClusters = ({
   value,
-  validateForm,
+  hasError,
   handleFormData,
 }: {
   value: string;
-  validateForm: boolean;
+  hasError: boolean;
   handleFormData: (value: any) => void;
 }) => {
-  const { isLoading, data, error } = useListCluster();
+  const { isLoading, data, error: listError } = useListCluster();
   return (
-    <RequestStateHandler loading={isLoading} error={error as RequestError}>
+    <RequestStateHandler loading={isLoading} error={listError as RequestError}>
       <Select
         name="clusterName"
         required={true}
         label="CLUSTER"
         onChange={event => handleFormData(event.target.value)}
         value={value}
-        error={validateForm && !value}
+        error={hasError}
       >
         {data?.gitopsClusters
           ?.filter(e =>
diff --git a/ui/src/components/Secrets/Shared/ListKustomizations.tsx b/ui/src/components/Secrets/Shared/ListKustomizations.tsx
index f08c78b708..e0f402acb8 100644
--- a/ui/src/components/Secrets/Shared/ListKustomizations.tsx
+++ b/ui/src/components/Secrets/Shared/ListKustomizations.tsx
@@ -6,16 +6,20 @@ import { Select } from '../../../utils/form';
 
 const ListKustomizations = ({
   value,
-  validateForm,
+  hasError,
   handleFormData,
   clusterName,
 }: {
   value: string;
-  validateForm: boolean;
+  hasError: boolean;
   handleFormData: (value: any) => void;
   clusterName: string;
 }) => {
-  const { isLoading, error, data } = useListKustomizationSOPS(
+  const {
+    isLoading,
+    error: listError,
+    data,
+  } = useListKustomizationSOPS(
     { clusterName },
     {
       retry: false,
@@ -23,7 +27,7 @@ const ListKustomizations = ({
   );
 
   return (
-    <RequestStateHandler loading={isLoading} error={error as RequestError}>
+    <RequestStateHandler loading={isLoading} error={listError as RequestError}>
       <Select
         className="form-section"
         required
@@ -32,7 +36,7 @@ const ListKustomizations = ({
         description="Choose the kustomization that will be used by SOPS to decrypt the secret."
         onChange={event => handleFormData(event.target.value)}
         value={value}
-        error={validateForm && !value}
+        error={hasError}
       >
         {data?.kustomizations?.length ? (
           data?.kustomizations?.map((k, index: number) => {
diff --git a/ui/src/utils/form.tsx b/ui/src/utils/form.tsx
index 96ab012ad4..51aa0f24a5 100644
--- a/ui/src/utils/form.tsx
+++ b/ui/src/utils/form.tsx
@@ -226,15 +226,17 @@ export const validateFormData = (
 
 interface InputDebounceProps extends InputProps {
   value?: string;
+  formError?: string;
   handleFormData: (value: any) => void;
 }
 
 export const InputDebounced: FC<InputDebounceProps> = ({
   value,
-  error,
+  formError,
   handleFormData,
   ...rest
 }) => {
+  const error = formError === rest.name && !value;
   const [data, setData] = useState<string>(value || '');
   const [inputError, setInputError] = useState<boolean>(error || false);
 
@@ -263,6 +265,7 @@ export const InputDebounced: FC<InputDebounceProps> = ({
 
   return (
     <Input
+      required={rest.required}
       className="form-section"
       {...rest}
       value={data}