diff --git a/app/templates/base.html b/app/templates/base.html
index c4c2808..73fe2eb 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -2130,7 +2130,20 @@
     input.blur();
   }
   function toggle(){ state.open ? close() : open(); }
-  function setIndex(i){ if(i>=0 && i<state.items.length){ state.index=i; render(); } }
+  function setIndex(i){
+    if(i>=0 && i<state.items.length) state.index=i;
+    // Toggle the active class without rebuilding #fd-cp-list: re-rendering on
+    // hover destroys the element under the cursor and breaks the next click.
+    var nodes = list.querySelectorAll('.cmd-palette-item');
+    for(var j=0;j<nodes.length;j++){
+      if(parseInt(nodes[j].getAttribute('data-idx'),10)===state.index){
+        nodes[j].classList.add('active');
+        nodes[j].scrollIntoView({block:'nearest'});
+      } else {
+        nodes[j].classList.remove('active');
+      }
+    }
+  }
   function choose(i){
     var it = state.items[i]; if(!it) return;
     if(it.run){ var ok = it.run(); if(ok) close(); return; }