diff --git a/frontend/apps/console-ce/src/css/legacy-boostrap.css b/frontend/apps/console-ce/src/css/legacy-boostrap.css
index bac87936615..94c5a8692c7 100644
--- a/frontend/apps/console-ce/src/css/legacy-boostrap.css
+++ b/frontend/apps/console-ce/src/css/legacy-boostrap.css
@@ -152,10 +152,14 @@ input[type='submit'] {
   cursor: pointer;
 }
 
-button[disabled],
+/* 
+This button style was overriding all disabled buttons in console,
+which was not allowing the `cursor-not-allowed` class to take effect
+*/
+/* button[disabled],
 html input[disabled] {
   cursor: default;
-}
+} */
 
 button::-moz-focus-inner,
 input::-moz-focus-inner {
diff --git a/frontend/apps/console-ee/src/css/legacy-boostrap.css b/frontend/apps/console-ee/src/css/legacy-boostrap.css
index 54965d7817f..5abfbf6a19c 100644
--- a/frontend/apps/console-ee/src/css/legacy-boostrap.css
+++ b/frontend/apps/console-ee/src/css/legacy-boostrap.css
@@ -152,10 +152,14 @@ input[type='submit'] {
   cursor: pointer;
 }
 
-button[disabled],
+/* 
+This button style was overriding all disabled buttons in console,
+which was not allowing the `cursor-not-allowed` class to take effect
+*/
+/* button[disabled],
 html input[disabled] {
   cursor: default;
-}
+} */
 
 button::-moz-focus-inner,
 input::-moz-focus-inner {
diff --git a/frontend/libs/console/legacy-ce/src/lib/components/Common/Layout/ExpandableEditor/Editor.js b/frontend/libs/console/legacy-ce/src/lib/components/Common/Layout/ExpandableEditor/Editor.js
index 13b48233ced..62034bad611 100644
--- a/frontend/libs/console/legacy-ce/src/lib/components/Common/Layout/ExpandableEditor/Editor.js
+++ b/frontend/libs/console/legacy-ce/src/lib/components/Common/Layout/ExpandableEditor/Editor.js
@@ -67,7 +67,7 @@ class Editor extends React.Component {
     const saveWithToggle = () => saveFunc(this.toggleEditor);
     return (
       <Button
-        type="submit"
+        type="button"
         mode="primary"
         isLoading={isProcessing}
         loadingText="Saving..."
@@ -87,7 +87,7 @@ class Editor extends React.Component {
     const removeWithToggle = () => removeFunc(this.toggleEditor);
     return (
       <Button
-        type="submit"
+        type="button"
         mode="destructive"
         isLoading={isProcessing}
         loadingText="Removing..."
diff --git a/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/Add/Add.tsx b/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/Add/Add.tsx
index 81917c9f1d9..4634c156be8 100644
--- a/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/Add/Add.tsx
+++ b/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/Add/Add.tsx
@@ -307,9 +307,11 @@ const Add: React.FC<Props> = props => {
       delete newState?.cleanupConfig;
     }
 
-    /* if auto cleanup is paused while creating event trigger */
-    /* remove the cleanup_config from the state */
-    if (state.cleanupConfig?.paused) {
+    /* don't pass cleanup config if it's empty or just have only paused*/
+    if (
+      JSON.stringify(newState?.cleanupConfig) === '{}' ||
+      JSON.stringify(newState?.cleanupConfig) === '{"paused":true}'
+    ) {
       delete newState?.cleanupConfig;
     }
 
diff --git a/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/Common/AutoCleanupForm.tsx b/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/Common/AutoCleanupForm.tsx
index 0b20a5508d9..6e0e32b770a 100644
--- a/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/Common/AutoCleanupForm.tsx
+++ b/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/Common/AutoCleanupForm.tsx
@@ -1,4 +1,6 @@
-import defaultState from '../state';
+import { FaCircle } from 'react-icons/fa';
+import { Analytics } from '../../../../../features/Analytics';
+import { Tooltip } from '../../../../../new-components/Tooltip';
 import { Collapsible } from '../../../../../new-components/Collapsible';
 import { DropdownButton } from '../../../../../new-components/DropdownButton';
 import { InputSection } from '../../../../../new-components/InputSetionWithoutForm';
@@ -21,132 +23,239 @@ const crons = [
 
 export const AutoCleanupForm = (props: AutoCleanupFormProps) => {
   const { cleanupConfig, onChange } = props;
+  const isCleanupConfigSet =
+    cleanupConfig && Object.keys(cleanupConfig).length > 0;
+
+  // disable other fields when cleanup is paused
+  const isDisable = isCleanupConfigSet
+    ? cleanupConfig?.paused
+    : !cleanupConfig?.paused;
+
   return (
     <div className="w-1/2">
-      <Collapsible
-        triggerChildren={
-          <h2 className="text-lg font-semibold mb-xs flex items-center mb-0">
-            Auto-cleanup Event Logs
-          </h2>
-        }
+      <Analytics
+        name="open-event-log-auto-cleanup"
+        passHtmlAttributesToChildren
       >
-        <div className="flex items-center mb-sm">
-          <Switch
-            checked={!cleanupConfig?.paused}
-            onCheckedChange={() => {
-              onChange({
-                ...cleanupConfig,
-                paused: !cleanupConfig?.paused,
-              });
-            }}
-          />
-          <span className="ml-xs cursor-pointer">Enable event log cleanup</span>
-        </div>
-        <div className="flex items-center mb-sm">
-          <Switch
-            checked={cleanupConfig?.clean_invocation_logs}
-            disabled={cleanupConfig?.paused}
-            onCheckedChange={() => {
-              onChange({
-                ...cleanupConfig,
-                clean_invocation_logs: !cleanupConfig?.clean_invocation_logs,
-              });
-            }}
-          />
-          <span className="ml-xs cursor-pointer">
-            Clean invocation logs with event logs
-          </span>
-        </div>
-
-        <InputSection
-          label="Clear logs older than (hours)"
-          tooltip="Clear event logs older than (in hours, default:168 hours or 7
-            days)"
-          placeholder={
-            defaultState?.cleanupConfig?.clear_older_than?.toString() ?? ''
-          }
-          value={cleanupConfig?.clear_older_than?.toString() ?? ''}
-          onChange={value => {
-            onChange({
-              ...cleanupConfig,
-              clear_older_than: value ? parseInt(value, 10) : undefined,
-            });
-          }}
-        />
-        <InputSection
-          label="Cleanup Frequency"
-          tooltip="Cron expression at which the cleanup should be invoked."
-          placeholder={defaultState?.cleanupConfig?.timeout?.toString() ?? ''}
-          value={cleanupConfig?.schedule?.toString() ?? ''}
-          onChange={value => {
-            onChange({
-              ...cleanupConfig,
-              schedule: value,
-            });
-          }}
-        />
-
-        <div className="my-sm">
-          <DropdownButton
-            items={[
-              crons.map(cron => (
-                <div
-                  key={cron.value}
-                  onClick={() => {
-                    onChange({
-                      ...cleanupConfig,
-                      schedule: cron.value,
-                    });
-                  }}
-                  className="py-xs cursor-pointer mx-1 px-xs py-1 rounded hover:bg-gray-100"
-                >
-                  <p className="mb-0 font-semibold whitespace-nowrap">
-                    {cron.label}
-                  </p>
-                  <p className="mb-0">{cron.value}</p>
-                </div>
-              )),
-            ]}
-          >
-            <span className="font-bold">Frequent Frequencies</span>
-          </DropdownButton>
-        </div>
         <Collapsible
           triggerChildren={
             <h2 className="text-lg font-semibold mb-xs flex items-center mb-0">
-              Advanced Settings
+              Auto-cleanup Event Logs
+              <div className="flex items-center">
+                <Tooltip
+                  side="top"
+                  tooltipContentChildren={
+                    isCleanupConfigSet &&
+                    !(
+                      cleanupConfig?.paused &&
+                      Object.keys(cleanupConfig).length === 1
+                    )
+                      ? 'Auto-cleanup has been configured. After clearing/resetting, save changes to remove the configuration.'
+                      : 'Auto-cleanup is currently not configured'
+                  }
+                  className="h-full flex items-center"
+                >
+                  {' '}
+                  {isCleanupConfigSet &&
+                  !(
+                    cleanupConfig?.paused &&
+                    Object.keys(cleanupConfig).length === 1
+                  ) ? (
+                    <FaCircle className="ml-xs fill-sky-600 text-xs" />
+                  ) : (
+                    <FaCircle className="ml-xs fill-slate-400 text-xs" />
+                  )}
+                  <Analytics
+                    name="event-auto-cleanup-clear-reset-btn"
+                    passHtmlAttributesToChildren
+                  >
+                    <span
+                      className="text-sky-500 ml-xs font-thin text-sm"
+                      onClick={() => onChange({})}
+                    >
+                      {isCleanupConfigSet &&
+                      !(
+                        cleanupConfig?.paused &&
+                        Object.keys(cleanupConfig).length === 1
+                      )
+                        ? 'Clear / Reset'
+                        : ''}
+                    </span>
+                  </Analytics>
+                </Tooltip>
+              </div>
             </h2>
           }
+          defaultOpen={!!cleanupConfig}
         >
-          <InputSection
-            label="Timeout (seconds)"
-            tooltip="Timeout for the query (in seconds, default: 60)"
-            placeholder={defaultState.cleanupConfig?.timeout?.toString() ?? ''}
-            value={cleanupConfig?.timeout?.toString() ?? ''}
-            onChange={value => {
-              onChange({
-                ...cleanupConfig,
-                timeout: value ? parseInt(value, 10) : undefined,
-              });
-            }}
-          />
+          <div className="flex items-center mb-sm">
+            <Tooltip
+              side="right"
+              tooltipContentChildren={
+                isCleanupConfigSet
+                  ? 'When not enabled, event log cleanup is paused. To completely remove event log cleanup configuration use Clear/Reset button'
+                  : 'When not enabled, event log cleanup is paused'
+              }
+              className="flex items-center ml-0"
+            >
+              <Switch
+                checked={cleanupConfig?.paused === false}
+                onCheckedChange={() => {
+                  onChange({
+                    ...cleanupConfig,
+                    paused: cleanupConfig?.paused === false ? true : false,
+                  });
+                }}
+              />
+              <span className="ml-xs cursor-pointer">
+                Enable event log cleanup
+              </span>
+            </Tooltip>
+          </div>
+          {
+            <div>
+              <div className="flex items-center mb-sm">
+                <Tooltip
+                  side="right"
+                  tooltipContentChildren={
+                    isDisable
+                      ? 'Enable event log cleanup to configure'
+                      : 'Enabling this will clear event invocation logs along with event logs'
+                  }
+                  className="flex items-center ml-0"
+                >
+                  <Switch
+                    checked={cleanupConfig?.clean_invocation_logs}
+                    disabled={isDisable}
+                    onCheckedChange={() => {
+                      onChange({
+                        ...cleanupConfig,
+                        clean_invocation_logs:
+                          !cleanupConfig?.clean_invocation_logs,
+                      });
+                    }}
+                  />
+                  <span className="ml-xs cursor-pointer">
+                    Clean invocation logs with event logs
+                  </span>
+                </Tooltip>
+              </div>
 
-          <InputSection
-            label="Batch Size"
-            tooltip="Number of event trigger logs to delete in a batch (default: 10,000)"
-            placeholder={
-              defaultState.cleanupConfig?.batch_size?.toString() ?? ''
-            }
-            value={cleanupConfig?.batch_size?.toString() ?? ''}
-            onChange={value => {
-              onChange({
-                ...cleanupConfig,
-                batch_size: value ? parseInt(value, 10) : undefined,
-              });
-            }}
-          />
+              <InputSection
+                label="Clear logs older than (hours)"
+                disabled={isDisable}
+                tooltip={
+                  isDisable
+                    ? `Enable event log cleanup to configure. Clear event logs older than (in hours)`
+                    : `Clear event logs older than (in hours)`
+                }
+                placeholder="168"
+                required
+                value={cleanupConfig?.clear_older_than?.toString() ?? ''}
+                onChange={value => {
+                  onChange({
+                    ...cleanupConfig,
+                    clear_older_than: value ? parseInt(value, 10) : undefined,
+                  });
+                }}
+              />
+              <InputSection
+                label="Cleanup Frequency"
+                disabled={isDisable}
+                tooltip={
+                  isDisable
+                    ? `Enable event log cleanup to configure. Cron expression at which the cleanup should be invoked.`
+                    : `Cron expression at which the cleanup should be invoked.`
+                }
+                placeholder="0 0 * * *"
+                required
+                value={cleanupConfig?.schedule?.toString() ?? ''}
+                onChange={value => {
+                  onChange({
+                    ...cleanupConfig,
+                    schedule: value,
+                  });
+                }}
+              />
+
+              <div className="my-sm">
+                <DropdownButton
+                  disabled={isDisable}
+                  items={[
+                    crons.map(cron => (
+                      <div
+                        key={cron.value}
+                        onClick={() => {
+                          onChange({
+                            ...cleanupConfig,
+                            schedule: cron.value,
+                          });
+                        }}
+                        className="py-xs cursor-pointer mx-1 px-xs py-1 rounded hover:bg-gray-100"
+                      >
+                        <p className="mb-0 font-semibold whitespace-nowrap">
+                          {cron.label}
+                        </p>
+                        <p className="mb-0">{cron.value}</p>
+                      </div>
+                    )),
+                  ]}
+                >
+                  <span className="font-bold">Frequent Frequencies</span>
+                </DropdownButton>
+              </div>
+              <Analytics
+                name="open-adv-setting-event-log-cleanup"
+                passHtmlAttributesToChildren
+              >
+                <Collapsible
+                  triggerChildren={
+                    <h2 className="text-lg font-semibold mb-xs flex items-center mb-0">
+                      Advanced Settings
+                    </h2>
+                  }
+                >
+                  <InputSection
+                    label="Timeout (seconds)"
+                    disabled={isDisable}
+                    tooltip={
+                      isDisable
+                        ? `Enable event log cleanup to configure. Timeout for the query (in seconds, default: 60)`
+                        : `Timeout for the query (in seconds, default: 60)`
+                    }
+                    placeholder="60"
+                    value={cleanupConfig?.timeout?.toString() ?? ''}
+                    onChange={value => {
+                      onChange({
+                        ...cleanupConfig,
+                        timeout: value ? parseInt(value, 10) : undefined,
+                      });
+                    }}
+                  />
+
+                  <InputSection
+                    label="Batch Size"
+                    disabled={isDisable}
+                    tooltip={
+                      isDisable
+                        ? `Enable event log cleanup to configure. Number of event trigger logs to delete in a batch (default: 10,000)`
+                        : `Number of event trigger logs to delete in a batch (default: 10,000)`
+                    }
+                    placeholder="10000"
+                    value={cleanupConfig?.batch_size?.toString() ?? ''}
+                    onChange={value => {
+                      onChange({
+                        ...cleanupConfig,
+                        batch_size: value ? parseInt(value, 10) : undefined,
+                      });
+                    }}
+                  />
+                </Collapsible>
+              </Analytics>
+            </div>
+          }
         </Collapsible>
-      </Collapsible>
+      </Analytics>
     </div>
   );
 };
diff --git a/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/Modify/Modify.tsx b/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/Modify/Modify.tsx
index c15900bc679..08a64876b43 100644
--- a/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/Modify/Modify.tsx
+++ b/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/Modify/Modify.tsx
@@ -339,9 +339,10 @@ const Modify: React.FC<Props> = props => {
 
       const modifyTriggerState = { ...state };
 
+      /* don't pass cleanup config if it's empty or just have only paused */
       if (
-        !currentTrigger?.configuration?.cleanup_config &&
-        state.cleanupConfig?.paused
+        JSON.stringify(modifyTriggerState?.cleanupConfig) === '{}' ||
+        JSON.stringify(modifyTriggerState?.cleanupConfig) === '{"paused":true}'
       ) {
         delete modifyTriggerState?.cleanupConfig;
       }
@@ -359,110 +360,111 @@ const Modify: React.FC<Props> = props => {
       );
     };
 
+  const submit = (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    saveWrapper()();
+  };
+
   const deleteWrapper = () => {
     dispatch(deleteEventTrigger(currentTrigger));
   };
 
   return (
     <Analytics name="ModifyEventTriggers" {...REDACT_EVERYTHING}>
-      <div
-        key={currentTrigger.name}
-        className="w-full overflow-y-auto bg-gray-50"
-      >
+      <div className="w-full overflow-y-auto bg-gray-50">
         <div className="max-w-6xl">
-          <TableHeader
-            count={null}
-            triggerName={currentTrigger.name}
-            tabName="modify"
-            readOnlyMode={readOnlyMode}
-          />
-          <br />
-          <h2 className="text-lg font-semibold mb-xs flex items-center">
-            Event Info
-          </h2>
-          <Info currentTrigger={currentTrigger} />
-          <div className="relative">
-            <WebhookEditor
-              currentTrigger={currentTrigger}
-              webhook={state.webhook}
-              setWebhook={setState.webhook}
-              save={saveWrapper('webhook')}
+          <form onSubmit={submit}>
+            <TableHeader
+              count={null}
+              triggerName={currentTrigger.name}
+              tabName="modify"
+              readOnlyMode={readOnlyMode}
             />
-            <OperationEditor
-              currentTrigger={currentTrigger}
-              databaseInfo={databaseInfo}
-              operations={state.operations}
-              setOperations={setState.operations}
-              operationColumns={state.operationColumns}
-              setOperationColumns={setState.operationColumns}
-              save={saveWrapper('ops')}
-              isAllColumnChecked={state.isAllColumnChecked}
-              handleColumnRadioButton={setState.toggleAllColumnChecked}
-            />
-            <hr className="my-md" />
-            <RetryConfEditor
-              conf={state.retryConf}
-              setRetryConf={setState.retryConf}
-              currentTrigger={currentTrigger}
-              save={saveWrapper('retry_conf')}
-            />
-            <hr className="my-md" />
-            {isProConsole(window.__env) && (
-              <div className="mb-md">
-                <AutoCleanupForm
-                  onChange={setState.cleanupConfig}
-                  cleanupConfig={
-                    state?.cleanupConfig || defaultState.cleanupConfig
-                  }
-                />
-              </div>
-            )}
-            <HeadersEditor
-              headers={state.headers}
-              setHeaders={setState.headers}
-              currentTrigger={currentTrigger}
-              save={saveWrapper('headers')}
-            />
-            <ConfigureTransformation
-              transformationType="event"
-              requestTransfromState={transformState}
-              resetSampleInput={resetSampleInput}
-              envVarsOnChange={envVarsOnChange}
-              sessionVarsOnChange={sessionVarsOnChange}
-              requestMethodOnChange={requestMethodOnChange}
-              requestUrlOnChange={requestUrlOnChange}
-              requestQueryParamsOnChange={requestQueryParamsOnChange}
-              requestAddHeadersOnChange={requestAddHeadersOnChange}
-              requestBodyOnChange={requestBodyOnChange}
-              requestSampleInputOnChange={requestSampleInputOnChange}
-              requestContentTypeOnChange={requestContentTypeOnChange}
-              requestUrlTransformOnChange={requestUrlTransformOnChange}
-              requestPayloadTransformOnChange={requestPayloadTransformOnChange}
-            />
-            {!readOnlyMode && (
-              <div className="mb-md">
-                <span className="mr-md">
+            <br />
+            <h2 className="text-lg font-semibold mb-xs flex items-center">
+              Event Info
+            </h2>
+            <Info currentTrigger={currentTrigger} />
+            <div className="relative">
+              <WebhookEditor
+                currentTrigger={currentTrigger}
+                webhook={state.webhook}
+                setWebhook={setState.webhook}
+                save={saveWrapper('webhook')}
+              />
+              <OperationEditor
+                currentTrigger={currentTrigger}
+                databaseInfo={databaseInfo}
+                operations={state.operations}
+                setOperations={setState.operations}
+                operationColumns={state.operationColumns}
+                setOperationColumns={setState.operationColumns}
+                save={saveWrapper('ops')}
+                isAllColumnChecked={state.isAllColumnChecked}
+                handleColumnRadioButton={setState.toggleAllColumnChecked}
+              />
+              <hr className="my-md" />
+              <RetryConfEditor
+                conf={state.retryConf}
+                setRetryConf={setState.retryConf}
+                currentTrigger={currentTrigger}
+                save={saveWrapper('retry_conf')}
+              />
+              <hr className="my-md" />
+              {isProConsole(window.__env) && (
+                <div className="mb-md">
+                  <AutoCleanupForm
+                    onChange={setState.cleanupConfig}
+                    cleanupConfig={state?.cleanupConfig}
+                  />
+                </div>
+              )}
+              <HeadersEditor
+                headers={state.headers}
+                setHeaders={setState.headers}
+                currentTrigger={currentTrigger}
+                save={saveWrapper('headers')}
+              />
+              <ConfigureTransformation
+                transformationType="event"
+                requestTransfromState={transformState}
+                resetSampleInput={resetSampleInput}
+                envVarsOnChange={envVarsOnChange}
+                sessionVarsOnChange={sessionVarsOnChange}
+                requestMethodOnChange={requestMethodOnChange}
+                requestUrlOnChange={requestUrlOnChange}
+                requestQueryParamsOnChange={requestQueryParamsOnChange}
+                requestAddHeadersOnChange={requestAddHeadersOnChange}
+                requestBodyOnChange={requestBodyOnChange}
+                requestSampleInputOnChange={requestSampleInputOnChange}
+                requestContentTypeOnChange={requestContentTypeOnChange}
+                requestUrlTransformOnChange={requestUrlTransformOnChange}
+                requestPayloadTransformOnChange={
+                  requestPayloadTransformOnChange
+                }
+              />
+              {!readOnlyMode && (
+                <div className="mb-md">
+                  <span className="mr-md">
+                    <Button
+                      mode="primary"
+                      type="submit"
+                      data-test="save-modify-trigger-changes"
+                    >
+                      Save Event Trigger
+                    </Button>
+                  </span>
                   <Button
-                    mode="primary"
-                    type="submit"
-                    onClick={() => {
-                      saveWrapper()();
-                    }}
-                    data-test="save-modify-trigger-changes"
+                    mode="destructive"
+                    data-test="delete-trigger"
+                    onClick={deleteWrapper}
                   >
-                    Save Event Trigger
+                    Delete Event Trigger
                   </Button>
-                </span>
-                <Button
-                  mode="destructive"
-                  data-test="delete-trigger"
-                  onClick={deleteWrapper}
-                >
-                  Delete Event Trigger
-                </Button>
-              </div>
-            )}
-          </div>
+                </div>
+              )}
+            </div>
+          </form>
         </div>
       </div>
     </Analytics>
diff --git a/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/state.ts b/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/state.ts
index a3556393672..0c62a9e38f3 100644
--- a/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/state.ts
+++ b/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/EventTriggers/state.ts
@@ -56,14 +56,6 @@ export const defaultState: LocalEventTriggerState = {
   headers: [defaultHeader],
   source: '',
   isAllColumnChecked: true,
-  cleanupConfig: {
-    schedule: '0 0 * * *',
-    batch_size: 10000,
-    clear_older_than: 168,
-    timeout: 60,
-    clean_invocation_logs: false,
-    paused: true,
-  },
 };
 
 export const parseServerETDefinition = (
diff --git a/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/Router.tsx b/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/Router.tsx
index 6be2f087e3a..0f1dca760f1 100644
--- a/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/Router.tsx
+++ b/frontend/libs/console/legacy-ce/src/lib/components/Services/Events/Router.tsx
@@ -64,7 +64,9 @@ const triggerRoutes = (
       <Route path=":triggerName" component={TriggerContainerConnector}>
         <Route
           path={getETModifyRoute({ type: 'relative' })}
-          component={ModifyEventTrigger}
+          component={props => (
+            <ModifyEventTrigger {...props} key={props?.params?.triggerName} />
+          )}
         />
         <Route
           path={getETPendingEventsRoute('relative')}
diff --git a/frontend/libs/console/legacy-ce/src/lib/new-components/InputSetionWithoutForm/InputSection.tsx b/frontend/libs/console/legacy-ce/src/lib/new-components/InputSetionWithoutForm/InputSection.tsx
index 8c4ca28f67d..fc9bdd60ca8 100644
--- a/frontend/libs/console/legacy-ce/src/lib/new-components/InputSetionWithoutForm/InputSection.tsx
+++ b/frontend/libs/console/legacy-ce/src/lib/new-components/InputSetionWithoutForm/InputSection.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import clsx from 'clsx';
 import { IconTooltip } from '../Tooltip';
 
 export const InputSection = (props: {
@@ -7,8 +8,11 @@ export const InputSection = (props: {
   onChange: (value: string) => void;
   placeholder: string;
   tooltip: string;
+  disabled?: boolean;
+  required?: boolean;
 }) => {
-  const { label, value, onChange, placeholder, tooltip } = props;
+  const { label, value, onChange, placeholder, tooltip, disabled, required } =
+    props;
   return (
     <div className="mb-sm">
       <label className="flex items-center mb-xs font-semibold text-muted">
@@ -20,7 +24,12 @@ export const InputSection = (props: {
         value={value}
         onChange={event => onChange(event.target.value)}
         placeholder={placeholder}
-        className="block w-full h-input shadow-sm rounded border border-gray-300 hover:border-gray-400 focus:outline-0 focus:ring-2 focus:ring-yellow-200 focus:border-yellow-400"
+        className={clsx(
+          'block w-full h-input shadow-sm rounded border border-gray-300 hover:border-gray-400 focus:outline-0 focus:ring-2 focus:ring-yellow-200 focus:border-yellow-400',
+          disabled ? 'cursor-not-allowed bg-gray-200' : 'cursor-pointer'
+        )}
+        disabled={disabled}
+        required={required}
       />
     </div>
   );