From 80c796343d72112510c5553176d3c7e67596e607 Mon Sep 17 00:00:00 2001
From: saarikabhasi <nairsaarika.bhasi@elastic.co>
Date: Mon, 26 Jan 2026 23:20:01 +0530
Subject: [PATCH 1/2] fix a11y heading annoucment

---
 .../public/components/overview/create_ruleset_modal.tsx   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/x-pack/solutions/search/plugins/search_query_rules/public/components/overview/create_ruleset_modal.tsx b/x-pack/solutions/search/plugins/search_query_rules/public/components/overview/create_ruleset_modal.tsx
index 72d3d4d93bf6f..5325addfae115 100644
--- a/x-pack/solutions/search/plugins/search_query_rules/public/components/overview/create_ruleset_modal.tsx
+++ b/x-pack/solutions/search/plugins/search_query_rules/public/components/overview/create_ruleset_modal.tsx
@@ -57,11 +57,16 @@ export const CreateRulesetModal = ({ onClose }: CreateRulesetModalProps) => {
   } = useKibana();
 
   return (
-    <EuiModal onClose={onClose} aria-labelledby={modalTitleId}>
+    <EuiModal
+      onClose={onClose}
+      aria-labelledby={modalTitleId}
+      initialFocus="[name=createRulesetModalFieldText]"
+    >
       <EuiModalHeader>
         <EuiModalHeaderTitle
           id={modalTitleId}
           data-test-subj="searchRulesetCreateRulesetModalHeader"
+          component="div"
         >
           <FormattedMessage
             id="xpack.queryRules.createRulesetModal.title"
@@ -106,6 +111,7 @@ export const CreateRulesetModal = ({ onClose }: CreateRulesetModalProps) => {
               isInvalid={conflictError}
               data-test-subj="searchRulesetCreateRulesetModalFieldText"
               value={rawName}
+              name="createRulesetModalFieldText"
               onChange={(e) => {
                 setRawName(e.target.value);
                 setName(formatRulesetName(e.target.value));

From 7bdf8a6f7fe3a6539cdf07d13bfacabebf84bc30 Mon Sep 17 00:00:00 2001
From: Saarika Bhasi <55930906+saarikabhasi@users.noreply.github.com>
Date: Thu, 29 Jan 2026 22:24:16 +0530
Subject: [PATCH 2/2] replace to h2 instead of div

---
 .../public/components/overview/create_ruleset_modal.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/solutions/search/plugins/search_query_rules/public/components/overview/create_ruleset_modal.tsx b/x-pack/solutions/search/plugins/search_query_rules/public/components/overview/create_ruleset_modal.tsx
index 5325addfae115..4c53bc0b7c953 100644
--- a/x-pack/solutions/search/plugins/search_query_rules/public/components/overview/create_ruleset_modal.tsx
+++ b/x-pack/solutions/search/plugins/search_query_rules/public/components/overview/create_ruleset_modal.tsx
@@ -66,7 +66,7 @@ export const CreateRulesetModal = ({ onClose }: CreateRulesetModalProps) => {
         <EuiModalHeaderTitle
           id={modalTitleId}
           data-test-subj="searchRulesetCreateRulesetModalHeader"
-          component="div"
+          component="h2"
         >
           <FormattedMessage
             id="xpack.queryRules.createRulesetModal.title"