diff --git a/static/index.html b/static/index.html
index e5ab030..193e38a 100644
--- a/static/index.html
+++ b/static/index.html
@@ -493,7 +493,7 @@
                             let nextIndex = (currentIndex - 1 + activeFocusableSet.length) % activeFocusableSet.length;
                             activeFocusableSet[nextIndex].focus();
                         } else if (activeFocusableSet.length > 0) { // If nothing specific focused, focus last
-                            activeFocusableSet[activeFocusableSet.length - 1].focus();
+                            $("#current-thumb").focus();
                         }
                         keyHandled = true;
                         break;
@@ -504,7 +504,7 @@
                             let nextIndex = (currentIndex + 1) % activeFocusableSet.length;
                             activeFocusableSet[nextIndex].focus();
                         } else if (activeFocusableSet.length > 0) { // If nothing specific focused, focus first
-                            activeFocusableSet[0].focus();
+                            $("#current-thumb").focus();
                         }
                         keyHandled = true;
                         break;