From 0ccc3c1cf51c4d03a460aa3f6151d244f8f28336 Mon Sep 17 00:00:00 2001
From: galangel <gal0angel@gmail.com>
Date: Thu, 13 May 2021 18:31:36 +0300
Subject: [PATCH 1/2] correct autofocus

Signed-off-by: galangel <gal0angel@gmail.com>
---
 src/plugins/data/public/ui/filter_bar/filter_bar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx b/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
index 800c4f5a5f15..112e039c86eb 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
+++ b/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
@@ -121,7 +121,7 @@ function FilterBarUI(props: Props) {
           withTitle
           panelPaddingSize="none"
           ownFocus={true}
-          initialFocus=".filterEditor__hiddenItem"
+          initialFocus='[data-test-subj="filterFieldSuggestionList"] [data-test-subj="comboBoxSearchInput"]'
           repositionOnScroll
         >
           <EuiFlexItem grow={false}>

From 779e1f3b50e5e7a25aad0f4cee3678c808dd7408 Mon Sep 17 00:00:00 2001
From: galangel <gal0angel@gmail.com>
Date: Tue, 18 May 2021 12:21:26 +0300
Subject: [PATCH 2/2] use class

Signed-off-by: galangel <gal0angel@gmail.com>
---
 src/plugins/data/public/ui/filter_bar/filter_bar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx b/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
index 112e039c86eb..e78224bce343 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
+++ b/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
@@ -121,7 +121,7 @@ function FilterBarUI(props: Props) {
           withTitle
           panelPaddingSize="none"
           ownFocus={true}
-          initialFocus='[data-test-subj="filterFieldSuggestionList"] [data-test-subj="comboBoxSearchInput"]'
+          initialFocus=".globalFilterEditor__fieldInput input"
           repositionOnScroll
         >
           <EuiFlexItem grow={false}>