diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx
index 0ee4faf69ae..ce7aeac97e3 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx
@@ -35,6 +35,7 @@ export const QueryEditorRow = ({
                 aria-pressed={hidden}
                 aria-label="hide metric"
                 className={styles.icon}
+                type="button"
               />
             )}
             <IconButton
@@ -44,6 +45,7 @@ export const QueryEditorRow = ({
               onClick={onRemoveClick || noop}
               disabled={!onRemoveClick}
               aria-label="remove metric"
+              type="button"
             />
           </span>
         </InlineLabel>
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/SettingsEditorContainer.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/SettingsEditorContainer.tsx
index a7d64e95f93..f9ec8a44278 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/SettingsEditorContainer.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/SettingsEditorContainer.tsx
@@ -47,6 +47,7 @@ export const SettingsEditorContainer = ({ label, children, hidden = false }: Pro
           className={cx('gf-form-label query-part', styles.button, segmentStyles)}
           onClick={() => setOpen(!open)}
           aria-expanded={open}
+          type="button"
         >
           <Icon name={open ? 'angle-down' : 'angle-right'} aria-hidden="true" className={styles.icon} />
           {label}