diff --git a/packages/ui/src/components/calendar/DateRangePopup.svelte b/packages/ui/src/components/calendar/DateRangePopup.svelte
index 543d07d21e..3dde501d6b 100644
--- a/packages/ui/src/components/calendar/DateRangePopup.svelte
+++ b/packages/ui/src/components/calendar/DateRangePopup.svelte
@@ -86,7 +86,9 @@
             <div
               class="btn"
               on:click={() => {
-                const shiftedDate = new Date(currentDate.getTime() + value * base)
+                const abs = Math.abs(value)
+                let shiftedDate = new Date(currentDate.getTime() + value * base)
+                if (abs < DAY && abs >= HOUR) shiftedDate = new Date(Date.now() + value * base)
                 dispatch('change', shiftedDate)
               }}
             >