diff --git a/static/app.js b/static/app.js
index b49b1ad..21cd6f9 100644
--- a/static/app.js
+++ b/static/app.js
@@ -19,8 +19,11 @@ function saveData() {
 
 let showAllMatches = false; // false = future matches only; true = all matches
 
+let initialLoad = true;
 function renderTable() {
     const container = document.getElementById('attendance-table');
+    // Save scroll position of the container
+    const scrollTop = window.scrollY;
     container.innerHTML = '';
     const table = document.createElement('table');
     // Header row
@@ -161,8 +164,14 @@ function renderTable() {
     container.appendChild(table);
     // Scroll to the most current match row after rendering
     setTimeout(() => {
-        const row = document.getElementById('current-match-row');
-        if (row) row.scrollIntoView({ behavior: 'smooth', block: 'center' });
+        if (initialLoad) {
+            const row = document.getElementById('current-match-row');
+            if (row) row.scrollIntoView({ behavior: 'smooth', block: 'center' });
+            initialLoad = false;
+        } else {
+            // Restore previous scroll position
+            window.scrollTo({ top: scrollTop });
+        }
     }, 0);
 }