diff --git a/js/app.js b/js/app.js
index efc4a76..6a4b94d 100644
--- a/js/app.js
+++ b/js/app.js
@@ -22,6 +22,7 @@ let draggedId = null;
 let showTrash = false;
 let selectedIds = new Set();
 let lastSelectedId = null;
+let arrowAnchor = -1;
 let rectState = { active: false, startX: 0, startY: 0, el: null, started: false };
 
 // ==================== SOUND ====================
@@ -1081,6 +1082,7 @@ function toggleSelectEntry(id, e) {
         else { selectedIds.clear(); selectedIds.add(id); }
     }
     lastSelectedId = id;
+    arrowAnchor = -1;
     updateBatchBar();
     render();
 }
@@ -1088,6 +1090,7 @@ function toggleSelectEntry(id, e) {
 function clearSelection() {
     selectedIds.clear();
     lastSelectedId = null;
+    arrowAnchor = -1;
     hideBatchBar();
     render();
 }
@@ -1411,14 +1414,14 @@ document.addEventListener('keydown', function(e) {
     }
 
     // Arrow keys for detail view navigation
-    if ((e.key === 'ArrowLeft' || e.key === 'ArrowRight') && !isInput && view === 'detail' && !document.getElementById('authSection').classList.contains('hidden')) {
+    if ((e.key === 'ArrowLeft' || e.key === 'ArrowRight') && !isInput && view === 'detail' && document.getElementById('authSection').classList.contains('hidden')) {
         e.preventDefault();
         goDetail(e.key === 'ArrowLeft' ? -1 : 1);
         return;
     }
 
     // Arrow keys — navigate entries in vault
-    if ((e.key === 'ArrowUp' || e.key === 'ArrowDown' || e.key === 'ArrowLeft' || e.key === 'ArrowRight') && !isInput && document.getElementById('authSection').classList.contains('hidden')) {
+    if ((e.key === 'ArrowUp' || e.key === 'ArrowDown' || e.key === 'ArrowLeft' || e.key === 'ArrowRight') && !isInput && document.getElementById('authSection').classList.contains('hidden') && view !== 'detail') {
         e.preventDefault();
         const filtered = getFilteredEntries();
         if (!filtered.length) return;
@@ -1436,15 +1439,14 @@ document.addEventListener('keydown', function(e) {
             else idx = idx > 0 ? idx - 1 : filtered.length - 1;
         }
         if (e.shiftKey) {
-            const anchorId = lastSelectedId !== null ? lastSelectedId : filtered[idx].id;
-            const anchor = filtered.findIndex(e => e.id == anchorId);
-            const start = Math.min(anchor, idx), end = Math.max(anchor, idx);
+            if (arrowAnchor < 0) arrowAnchor = idx;
+            const start = Math.min(arrowAnchor, idx), end = Math.max(arrowAnchor, idx);
             selectedIds.clear();
             for (let i = start; i <= end; i++) selectedIds.add(filtered[i].id);
         } else {
             selectedIds.clear();
             selectedIds.add(filtered[idx].id);
-            lastSelectedId = filtered[idx].id;
+            if (arrowAnchor < 0) arrowAnchor = idx;
         }
         updateBatchBar(); render(); playSound('click');
         return;