diff --git a/x-pack/plugins/enterprise_search/public/applications/applications/components/search_application/add_indices_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/applications/components/search_application/add_indices_flyout.tsx
index 0a0c7af7ed02..2f483d757505 100644
--- a/x-pack/plugins/enterprise_search/public/applications/applications/components/search_application/add_indices_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/applications/components/search_application/add_indices_flyout.tsx
@@ -19,7 +19,6 @@ import {
   EuiFlyoutBody,
   EuiFlyoutFooter,
   EuiFlyoutHeader,
-  EuiFormRow,
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
@@ -90,25 +89,22 @@ export const AddIndicesFlyout: React.FC<AddIndicesFlyoutProps> = ({ onClose }) =
         )}
       </EuiFlyoutHeader>
       <EuiFlyoutBody>
-        <EuiFormRow
+        <IndicesSelectComboBox
           fullWidth
+          onChange={onIndicesChange}
+          selectedOptions={selectedOptions}
+          ignoredOptions={existingIndices}
           label={i18n.translate(
             'xpack.enterpriseSearch.searchApplications.searchApplication.indices.addIndicesFlyout.selectableLabel',
             { defaultMessage: 'Select searchable indices' }
           )}
-        >
-          <IndicesSelectComboBox
-            fullWidth
-            onChange={onIndicesChange}
-            selectedOptions={selectedOptions}
-            ignoredOptions={existingIndices}
-          />
-        </EuiFormRow>
+        />
       </EuiFlyoutBody>
       <EuiFlyoutFooter>
         <EuiFlexGroup justifyContent="spaceBetween" direction="rowReverse">
           <EuiFlexItem grow={false}>
             <EuiButton
+              data-test-subj="enterpriseSearchAddIndicesFlyoutAddSelectedButton"
               fill
               data-telemetry-id="entSearchApplications-indices-addNewIndices-submit"
               iconType="plusInCircle"
@@ -122,6 +118,7 @@ export const AddIndicesFlyout: React.FC<AddIndicesFlyoutProps> = ({ onClose }) =
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty
+              data-test-subj="enterpriseSearchAddIndicesFlyoutCancelButton"
               data-telemetry-id="entSearchApplications-indices-addNewIndices-cancel"
               flush="left"
               onClick={onClose}
diff --git a/x-pack/plugins/enterprise_search/public/applications/applications/components/search_applications/components/indices_select_combobox.tsx b/x-pack/plugins/enterprise_search/public/applications/applications/components/search_applications/components/indices_select_combobox.tsx
index 76880766438a..b35b5ac45c01 100644
--- a/x-pack/plugins/enterprise_search/public/applications/applications/components/search_applications/components/indices_select_combobox.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/applications/components/search_applications/components/indices_select_combobox.tsx
@@ -17,6 +17,7 @@ import {
   EuiFlexItem,
   EuiHealth,
   EuiHighlight,
+  EuiFormRow,
 } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
@@ -36,12 +37,14 @@ export type IndicesSelectComboBoxProps = Omit<
 > & {
   'data-telemetry-id'?: string;
   ignoredOptions?: string[];
+  label?: string;
 };
 
 export const IndicesSelectComboBox = ({ ignoredOptions, ...props }: IndicesSelectComboBoxProps) => {
   const [searchQuery, setSearchQuery] = useState<string | undefined>(undefined);
   const { makeRequest } = useActions(FetchIndicesForSearchApplicationsAPILogic);
   const { status, data } = useValues(FetchIndicesForSearchApplicationsAPILogic);
+  const isInvalid = Boolean(searchQuery && !props.selectedOptions?.length);
 
   useEffect(() => {
     makeRequest({ searchQuery });
@@ -85,7 +88,20 @@ export const IndicesSelectComboBox = ({ ignoredOptions, ...props }: IndicesSelec
     renderOption,
     ...props,
   };
-  return <EuiComboBox async {...defaultedProps} />;
+
+  return (
+    <EuiFormRow
+      label={props.label || null}
+      fullWidth={props.fullWidth}
+      isInvalid={isInvalid}
+      error={i18n.translate(
+        'xpack.enterpriseSearch.searchApplications.indicesSelectComboBox.error',
+        { defaultMessage: 'No indices match the entered value' }
+      )}
+    >
+      <EuiComboBox async isInvalid={isInvalid} {...defaultedProps} />
+    </EuiFormRow>
+  );
 };
 
 export const indexToOption = (