diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.test.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.test.tsx
index 40569283fe8..b3c4696871d 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.test.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.test.tsx
@@ -91,3 +91,25 @@ describe('TimePicker', () => {
     expect(unsyncButtons.length).toBe(2);
   });
 });
+
+it('does not submit wrapping forms', async () => {
+  const onSubmit = jest.fn();
+  const container = render(
+    <form onSubmit={onSubmit}>
+      <TimeRangePicker
+        onChangeTimeZone={() => {}}
+        onChange={(value) => {}}
+        value={value}
+        onMoveBackward={() => {}}
+        onMoveForward={() => {}}
+        onZoom={() => {}}
+      />
+    </form>
+  );
+
+  const clicks = container.getAllByRole('button').map((button) => userEvent.click(button));
+
+  await Promise.all(clicks);
+
+  expect(onSubmit).not.toHaveBeenCalled();
+});
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
index 6c546d380e2..ef05c435fd4 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
@@ -149,6 +149,7 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
           variant={variant}
           onClick={onMoveBackward}
           icon="angle-left"
+          type="button"
           narrow
         />
       )}
@@ -168,6 +169,7 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
           onClick={onToolbarButtonSwitch}
           icon={timePickerIcon}
           isOpen={isOpen}
+          type="button"
           variant={variant}
         >
           <TimePickerButtonLabel {...props} />
@@ -206,6 +208,7 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
           onClick={onMoveForward}
           icon="angle-right"
           narrow
+          type="button"
           variant={variant}
         />
       )}
@@ -215,6 +218,7 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
           aria-label={t('time-picker.range-picker.zoom-out-button', 'Zoom out time range')}
           onClick={onZoom}
           icon="search-minus"
+          type="button"
           variant={variant}
         />
       </Tooltip>