diff --git a/Overlord-Server/public/assets/country-picker.js b/Overlord-Server/public/assets/country-picker.js
index f6a88b2..ac96ec1 100644
--- a/Overlord-Server/public/assets/country-picker.js
+++ b/Overlord-Server/public/assets/country-picker.js
@@ -213,11 +213,11 @@ function flagHtml(code) {
   return `<span class="fi fi-${cc}"></span>`;
 }
 
-export function initCountryPicker(onSelect) {
+export function initCountryPicker(onSelect, initialCode = "all") {
   const anchor = document.getElementById("country-picker-anchor");
   if (!anchor) return;
 
-  let currentCode = "all";
+  let currentCode = initialCode;
   let countryData = []; // [{ code, count }]
   let panelOpen = false;
 
@@ -226,7 +226,10 @@ export function initCountryPicker(onSelect) {
   btn.id = "country-picker-btn";
   btn.className =
     "inline-flex items-center gap-2 bg-slate-900/70 border border-slate-800 rounded-lg px-3 py-2 text-slate-100 hover:border-slate-600 transition-colors";
-  btn.innerHTML = `<i class="fa-solid fa-earth-americas text-slate-400"></i><span id="country-picker-label">All Countries</span><i class="fa-solid fa-chevron-down text-slate-400 text-xs"></i>`;
+  const initialFlag = initialCode !== "all" ? flagHtml(initialCode) : "";
+  const initialName = initialCode !== "all" && COUNTRIES[initialCode] ? COUNTRIES[initialCode][0] : "All Countries";
+  const initialLabelHtml = initialCode !== "all" ? `${initialFlag}&nbsp;${initialName}` : "All Countries";
+  btn.innerHTML = `<i class="fa-solid fa-earth-americas text-slate-400"></i><span id="country-picker-label">${initialLabelHtml}</span><i class="fa-solid fa-chevron-down text-slate-400 text-xs"></i>`;
   anchor.appendChild(btn);
 
   const panel = document.createElement("div");
diff --git a/Overlord-Server/public/assets/main.js b/Overlord-Server/public/assets/main.js
index 5b44b26..c3e4099 100644
--- a/Overlord-Server/public/assets/main.js
+++ b/Overlord-Server/public/assets/main.js
@@ -41,6 +41,9 @@ const serverVersionText = document.getElementById("server-version-text");
 const selectedClients = new Set();
 let lastNonOnlineStatus = "all";
 const PREF_FILTER_STATUS_KEY = "overlord_filter_status";
+const PREF_SORT_KEY = "overlord_sort";
+const PREF_FILTER_OS_KEY = "overlord_filter_os";
+const PREF_FILTER_COUNTRY_KEY = "overlord_filter_country";
 
 let currentUser = null;
 let contextCard = null;
@@ -443,6 +446,7 @@ searchInput?.addEventListener("input", (e) => {
 
 sortSelect?.addEventListener("change", (e) => {
   state.sort = e.target.value;
+  localStorage.setItem(PREF_SORT_KEY, state.sort);
   state.page = 1;
   state.lastDigest = "";
   loadWithOptions({ force: true, reorder: true });
@@ -464,6 +468,7 @@ filterStatusSelect?.addEventListener("change", (e) => {
 
 filterOsSelect?.addEventListener("change", (e) => {
   state.filterOs = e.target.value;
+  localStorage.setItem(PREF_FILTER_OS_KEY, state.filterOs);
   state.page = 1;
   state.lastDigest = "";
   loadWithOptions({ force: true, reorder: true });
@@ -471,19 +476,38 @@ filterOsSelect?.addEventListener("change", (e) => {
 
 initCountryPicker((code) => {
   state.filterCountry = code;
+  localStorage.setItem(PREF_FILTER_COUNTRY_KEY, code);
   state.page = 1;
   state.lastDigest = "";
   loadWithOptions({ force: true, reorder: true });
-});
+}, localStorage.getItem(PREF_FILTER_COUNTRY_KEY) || "all");
 
 (function restoreFilterStatus() {
-  const saved = localStorage.getItem(PREF_FILTER_STATUS_KEY);
-  const valid = ["all", "online", "offline"];
-  if (saved && valid.includes(saved)) {
-    state.filterStatus = saved;
-    if (filterStatusSelect) filterStatusSelect.value = saved;
-    if (showOfflineToggle) showOfflineToggle.checked = saved !== "online";
-    if (saved !== "online") lastNonOnlineStatus = saved;
+  const savedStatus = localStorage.getItem(PREF_FILTER_STATUS_KEY);
+  const validStatuses = ["all", "online", "offline"];
+  if (savedStatus && validStatuses.includes(savedStatus)) {
+    state.filterStatus = savedStatus;
+    if (filterStatusSelect) filterStatusSelect.value = savedStatus;
+    if (showOfflineToggle) showOfflineToggle.checked = savedStatus !== "online";
+    if (savedStatus !== "online") lastNonOnlineStatus = savedStatus;
+  }
+
+  const savedSort = localStorage.getItem(PREF_SORT_KEY);
+  const validSorts = ["stable", "last_seen_desc", "host_asc", "ping_asc", "ping_desc", "country_asc", "country_desc"];
+  if (savedSort && validSorts.includes(savedSort)) {
+    state.sort = savedSort;
+    if (sortSelect) sortSelect.value = savedSort;
+  }
+
+  const savedOs = localStorage.getItem(PREF_FILTER_OS_KEY);
+  if (savedOs) {
+    state.filterOs = savedOs;
+    if (filterOsSelect) filterOsSelect.value = savedOs;
+  }
+
+  const savedCountry = localStorage.getItem(PREF_FILTER_COUNTRY_KEY);
+  if (savedCountry) {
+    state.filterCountry = savedCountry;
   }
 })();