diff --git a/dashboard/src/views/EventlogView.vue b/dashboard/src/views/EventlogView.vue
index e49272a32..0dbd07d8c 100644
--- a/dashboard/src/views/EventlogView.vue
+++ b/dashboard/src/views/EventlogView.vue
@@ -141,7 +141,7 @@ function goToPrevMatch() {
 }
 
 async function goToNextMatch() {
-  if (searching.value) return;
+  if (!highlight.value || searching.value) return;
 
   if (currentMatchPosition.value + 1 < matchIndices.value.length) {
     currentMatchPosition.value++;
@@ -282,11 +282,11 @@ onUnmounted(() => {
         <div style="padding: 15px; display: flex; flex-direction: column; gap: 10px;">
           <FormGroup>
             <label>From</label>
-            <DateTimeInput date-only v-model="filterFrom" />
+            <DateTimeInput date-only v-model="filterFrom" :max="filterTo" />
           </FormGroup>
           <FormGroup>
             <label>To</label>
-            <DateTimeInput date-only v-model="filterTo" />
+            <DateTimeInput date-only v-model="filterTo" :min="filterFrom" />
           </FormGroup>
         </div>
       </Popover>