diff --git a/apps/web/ee/components/workflows/WorkflowStepContainer.tsx b/apps/web/ee/components/workflows/WorkflowStepContainer.tsx
index 23230283bd..e7c64ed778 100644
--- a/apps/web/ee/components/workflows/WorkflowStepContainer.tsx
+++ b/apps/web/ee/components/workflows/WorkflowStepContainer.tsx
@@ -92,7 +92,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                 return (
                   <Select
                     isSearchable={false}
-                    className="mt-3 block w-full min-w-0 flex-1 rounded-sm sm:text-sm"
+                    className="mt-3 block w-full min-w-0 flex-1 rounded-sm text-sm"
                     onChange={(val) => {
                       if (val) {
                         form.setValue("trigger", val.value);
@@ -134,7 +134,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                         return (
                           <Select
                             isSearchable={false}
-                            className="block min-w-0 flex-1 rounded-sm"
+                            className="block min-w-0 flex-1 rounded-sm text-sm"
                             onChange={(val) => {
                               if (val) {
                                 form.setValue("timeUnit", val.value);
@@ -177,17 +177,25 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                     return (
                       <Select
                         isSearchable={false}
-                        className="mt-3 block w-full min-w-0 flex-1 rounded-sm"
+                        className="mt-3 block w-full min-w-0 flex-1 rounded-sm text-sm"
                         onChange={(val) => {
                           if (val) {
+                            let counter = 0;
                             if (val.value === WorkflowActions.SMS_NUMBER) {
                               setIsPhoneNumberNeeded(true);
                               setEditNumberMode(true);
-                              setEditCounter(editCounter + 1);
+                              counter = counter + 1;
                             } else {
                               setIsPhoneNumberNeeded(false);
                               setEditNumberMode(false);
-                              setEditCounter(editCounter - 1);
+                            }
+
+                            if (
+                              form.getValues(`steps.${step.stepNumber - 1}.template`) ===
+                              WorkflowTemplates.CUSTOM
+                            ) {
+                              setEditEmailBodyMode(true);
+                              counter = counter + 1;
                             }
 
                             if (
@@ -195,13 +203,10 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                               val.value === WorkflowActions.EMAIL_HOST
                             ) {
                               setIsEmailSubjectNeeded(true);
-                              if (!form.getValues(`steps.${step.stepNumber - 1}.emailSubject`)) {
-                                setEditEmailBodyMode(true);
-                                setEditCounter(editCounter + 1);
-                              }
                             } else {
                               setIsEmailSubjectNeeded(false);
                             }
+                            setEditCounter(counter);
                             form.setValue(`steps.${step.stepNumber - 1}.action`, val.value);
                             setErrorMessageNumber("");
                             setErrorMessageCustomInput("");
@@ -298,7 +303,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                             if (isCustomTemplate) {
                               setEditEmailBodyMode(true);
                               setEditCounter(editCounter + 1);
-                            } else {
+                            } else if (editEmailBodyMode) {
                               setEditEmailBodyMode(false);
                               setEditCounter(editCounter - 1);
                             }