diff --git a/assets/js/autocomplete.ts b/assets/js/autocomplete.ts
index 21fd50dd..2fecad0d 100644
--- a/assets/js/autocomplete.ts
+++ b/assets/js/autocomplete.ts
@@ -125,18 +125,38 @@ function createItem(list: HTMLUListElement, suggestion: TermSuggestion) {
     className: 'autocomplete__item',
   });
 
+  let ignoreMouseOver = true;
+
   item.textContent = suggestion.label;
   item.dataset.value = suggestion.value;
 
-  item.addEventListener('mouseover', () => {
+  function onItemMouseOver() {
+    // Prevent selection when mouse entered the element without actually moving.
+    if (ignoreMouseOver) {
+      return;
+    }
+
     removeSelected();
     item.classList.add('autocomplete__item--selected');
-  });
+  }
+
+  item.addEventListener('mouseover', onItemMouseOver);
 
   item.addEventListener('mouseout', () => {
     removeSelected();
   });
 
+  item.addEventListener(
+    'mousemove',
+    () => {
+      ignoreMouseOver = false;
+      onItemMouseOver();
+    },
+    {
+      once: true,
+    },
+  );
+
   item.addEventListener('click', () => {
     if (!inputField || !item.dataset.value) return;