diff --git a/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/expression/boundary_form.tsx b/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/expression/boundary_form.tsx
index 3ceced326ebba..caa9bc8157245 100644
--- a/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/expression/boundary_form.tsx
+++ b/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/expression/boundary_form.tsx
@@ -13,6 +13,7 @@ import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { DataViewSelect } from './data_view_select';
 import { SingleFieldSelect } from './single_field_select';
+import { QueryInput } from './query_input';
 
 export const BOUNDARY_GEO_FIELD_TYPES = ['geo_shape'];
 
@@ -37,6 +38,7 @@ interface Props {
   setDataViewTitle: (title: string) => void;
   setGeoField: (fieldName: string) => void;
   setNameField: (fieldName: string) => void;
+  setQuery: (query: Query) => void;
   unifiedSearch: UnifiedSearchPublicPluginStart;
 }
 
@@ -194,6 +196,23 @@ export const BoundaryForm = (props: Props) => {
                 fields={nameFields}
               />
             </EuiFormRow>
+
+            <EuiFormRow
+              helpText={i18n.translate('xpack.stackAlerts.geoContainment.boundariesFilterHelpText', {
+                defaultMessage: 'Add a filter to narrow boundaries.',
+              })}
+              label={i18n.translate('xpack.stackAlerts.geoContainment.filterLabel', {
+                defaultMessage: 'Filter',
+              })}
+            >
+              <QueryInput
+                dataView={dataView}
+                onChange={(query: Query) => {
+                  props.setQuery(query);
+                }}
+                query={props.ruleParams.boundaryIndexQuery}
+              />
+            </EuiFormRow>
           </>
         )}
       </EuiSkeletonText>
diff --git a/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/expression/entity_form.tsx b/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/expression/entity_form.tsx
index 506fd915b1003..00eee802d04c7 100644
--- a/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/expression/entity_form.tsx
+++ b/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/expression/entity_form.tsx
@@ -248,9 +248,7 @@ export const EntityForm = (props: Props) => {
             </EuiFormRow>
 
             <EuiFormRow
-              error={entityFieldError}
-              isInvalid={Boolean(entityFieldError)}
-              helpText={i18n.translate('xpack.stackAlerts.geoContainment.filterHelpText', {
+              helpText={i18n.translate('xpack.stackAlerts.geoContainment.entityFilterHelpText', {
                 defaultMessage: 'Add a filter to narrow entities.',
               })}
               label={i18n.translate('xpack.stackAlerts.geoContainment.filterLabel', {
diff --git a/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/expression/expression.tsx b/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/expression/expression.tsx
index 64e4394d2beb3..c99bd7f5c0d3d 100644
--- a/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/expression/expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/expression/expression.tsx
@@ -46,6 +46,7 @@ export const GeoContainmentRuleTypeExpression: React.FunctionComponent<
         setDataViewTitle={(title: string) => props.setRuleParams('boundaryIndexTitle', title)}
         setGeoField={(fieldName: string) => props.setRuleParams('boundaryGeoField', fieldName)}
         setNameField={(fieldName: string) => props.setRuleParams('boundaryNameField', fieldName)}
+        setQuery={(query: Query) => props.setRuleParams('boundaryIndexQuery', query)}
         unifiedSearch={props.unifiedSearch}
       />