diff --git a/libs/ui-lib-tests/cypress/views/clusterDetails.ts b/libs/ui-lib-tests/cypress/views/clusterDetails.ts
index 428141d933..6adafdb1c0 100644
--- a/libs/ui-lib-tests/cypress/views/clusterDetails.ts
+++ b/libs/ui-lib-tests/cypress/views/clusterDetails.ts
@@ -142,7 +142,7 @@ export const clusterDetailsPage = {
     return cy.get('#form-static-platform-field');
   },
   clickClusterDetailsBody: () => {
-    cy.get('.pf-v5-l-grid').click();
+    cy.get('body').click();
   },
   validateInputDnsDomainFieldHelper: (msg) => {
     cy.get(Cypress.env('baseDnsDomainFieldHelperErrorId')).should('contain', msg);
diff --git a/libs/ui-lib/lib/common/components/ui/formik/TextAreaField.tsx b/libs/ui-lib/lib/common/components/ui/formik/TextAreaField.tsx
index d75b7cd464..bf3aef1c95 100644
--- a/libs/ui-lib/lib/common/components/ui/formik/TextAreaField.tsx
+++ b/libs/ui-lib/lib/common/components/ui/formik/TextAreaField.tsx
@@ -60,13 +60,20 @@ const TextAreaField: React.FC<TextAreaFieldProps> = ({
       {(errorMessage || helperText) && (
         <FormHelperText>
           <HelperText>
-            <HelperTextItem
-              icon={errorMessage && <ExclamationCircleIcon />}
-              variant={errorMessage ? 'error' : 'default'}
-              id={errorMessage ? `${fieldId}-helper-error` : `${fieldId}-helper`}
-            >
-              {errorMessage ? errorMessage : helperText}
-            </HelperTextItem>
+            {errorMessage && (
+              <HelperTextItem
+                icon={<ExclamationCircleIcon />}
+                variant={'error'}
+                id={`${fieldId}-helper-error`}
+              >
+                {errorMessage}
+              </HelperTextItem>
+            )}
+            {helperText && (
+              <HelperTextItem variant={'default'} id={`${fieldId}-helper`}>
+                {helperText}
+              </HelperTextItem>
+            )}
           </HelperText>
         </FormHelperText>
       )}