diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts
index 596b92d064050f..dfe984cba3816b 100644
--- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts
@@ -38,6 +38,7 @@ import {
   SCHEDULE_INTERVAL_AMOUNT_INPUT,
   SCHEDULE_INTERVAL_UNITS_INPUT,
   SEVERITY_DROPDOWN,
+  TAGS_CLEAR_BUTTON,
   TAGS_FIELD,
 } from '../screens/create_new_rule';
 import {
@@ -215,8 +216,7 @@ describe('Custom detection rules creation', () => {
   });
 });
 
-// FLAKY: https://github.com/elastic/kibana/issues/83772
-describe.skip('Custom detection rules deletion and edition', () => {
+describe('Custom detection rules deletion and edition', () => {
   beforeEach(() => {
     esArchiverLoad('custom_rules');
     loginAndWaitForPageWithoutDateRange(DETECTIONS_URL);
@@ -328,6 +328,7 @@ describe.skip('Custom detection rules deletion and edition', () => {
       cy.get(ACTIONS_THROTTLE_INPUT).invoke('val').should('eql', 'no_actions');
 
       goToAboutStepTab();
+      cy.get(TAGS_CLEAR_BUTTON).click({ force: true });
       fillAboutRule(editedRule);
       saveEditedRule();
 
diff --git a/x-pack/plugins/security_solution/cypress/objects/rule.ts b/x-pack/plugins/security_solution/cypress/objects/rule.ts
index 0bb4c8e3560912..8ba545e242b47b 100644
--- a/x-pack/plugins/security_solution/cypress/objects/rule.ts
+++ b/x-pack/plugins/security_solution/cypress/objects/rule.ts
@@ -265,4 +265,5 @@ export const editedRule = {
   ...existingRule,
   severity: 'Medium',
   description: 'Edited Rule description',
+  tags: [...existingRule.tags, 'edited'],
 };
diff --git a/x-pack/plugins/security_solution/cypress/screens/create_new_rule.ts b/x-pack/plugins/security_solution/cypress/screens/create_new_rule.ts
index 618ddbad9f44a4..d802e97363a687 100644
--- a/x-pack/plugins/security_solution/cypress/screens/create_new_rule.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/create_new_rule.ts
@@ -146,6 +146,9 @@ export const TAGS_FIELD =
 export const TAGS_INPUT =
   '[data-test-subj="detectionEngineStepAboutRuleTags"] [data-test-subj="comboBoxSearchInput"]';
 
+export const TAGS_CLEAR_BUTTON =
+  '[data-test-subj="detectionEngineStepAboutRuleTags"] [data-test-subj="comboBoxClearButton"]';
+
 export const THRESHOLD_FIELD_SELECTION = '.euiFilterSelectItem';
 
 export const THRESHOLD_INPUT_AREA = '[data-test-subj="thresholdInput"]';
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.tsx b/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.tsx
index 5e3045efe1f4d5..54a2381ecf5875 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.tsx
@@ -57,9 +57,11 @@ const JobName = ({ id, description, basePath }: JobNameProps) => {
 
   return (
     <JobNameWrapper>
-      <EuiLink data-test-subj="jobs-table-link" href={jobUrl} target="_blank">
-        <EuiText size="s">{id}</EuiText>
-      </EuiLink>
+      <EuiText size="s">
+        <EuiLink data-test-subj="jobs-table-link" href={jobUrl} target="_blank">
+          {id}
+        </EuiLink>
+      </EuiText>
       <EuiText color="subdued" size="xs">
         {description.length > truncateThreshold
           ? `${description.substring(0, truncateThreshold)}...`
diff --git a/x-pack/plugins/security_solution/public/common/containers/source/index.tsx b/x-pack/plugins/security_solution/public/common/containers/source/index.tsx
index 7e73a40f2f748a..f245857f3d0db1 100644
--- a/x-pack/plugins/security_solution/public/common/containers/source/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/source/index.tsx
@@ -126,7 +126,7 @@ export const useFetchIndex = (
   const { data, notifications } = useKibana().services;
   const abortCtrl = useRef(new AbortController());
   const previousIndexesName = useRef<string[]>([]);
-  const [isLoading, setLoading] = useState(true);
+  const [isLoading, setLoading] = useState(false);
 
   const [state, setState] = useState<FetchIndexReturn>({
     browserFields: DEFAULT_BROWSER_FIELDS,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.tsx
index bf3498b28cd45d..f0326913909b5d 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.tsx
@@ -25,14 +25,13 @@ export const DEFAULT_THROTTLE_OPTION = THROTTLE_OPTIONS[0];
 type ThrottleSelectField = typeof SelectField;
 
 export const ThrottleSelectField: ThrottleSelectField = (props) => {
+  const { setValue } = props.field;
   const onChange = useCallback(
     (e) => {
       const throttle = e.target.value;
-      props.field.setValue(throttle);
-      props.handleChange(throttle);
+      setValue(throttle);
     },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [props.field.setValue, props.handleChange]
+    [setValue]
   );
   const newEuiFieldProps = { ...props.euiFieldProps, onChange };
   return <SelectField {...props} euiFieldProps={newEuiFieldProps} />;