diff --git a/internal/web/public/js/index.js b/internal/web/public/js/index.js
index c496fbd..09f3fed 100644
--- a/internal/web/public/js/index.js
+++ b/internal/web/public/js/index.js
@@ -50,12 +50,22 @@ async function loadAddrs() {
     bkpArray = addrsArray;
 
     field = localStorage.getItem("sortField");
+    down = JSON.parse(localStorage.getItem("sortDown"));
 
     checkNotEmpty(addrsArray);
 }
 
 function sortBy(f) {
     field = f;
+    if (field != oldField) {
+        oldField = field;
+        down = !down;
+    } else {
+        oldField = '';
+        down = !down;
+    }
+
+    localStorage.setItem("sortDown", down);
     localStorage.setItem("sortField", field);
     checkNotEmpty(addrsArray);
 }
@@ -69,7 +79,7 @@ function editClick() {
 function checkNotEmpty(someArray) {
 
     if (someArray.length > 0) {
-        if (field != null) {
+        if ((field != null) && (down != null)) {
             sortByAny(someArray);
         } else {
             displayArrayData(someArray);
diff --git a/internal/web/public/js/sort.js b/internal/web/public/js/sort.js
index 888b809..0f7f4cf 100644
--- a/internal/web/public/js/sort.js
+++ b/internal/web/public/js/sort.js
@@ -1,5 +1,6 @@
-var oldField = '';
-var field = '';
+let oldField = '';
+let field = '';
+let down = false;
 
 function displayArrayData(someArray) {
     document.getElementById('tBody').innerHTML = "";
@@ -14,14 +15,6 @@ function displayArrayData(someArray) {
 
 function sortByAny(someArray) {
 
-    if (field != oldField) {
-        oldField = field;
-        down = true;
-    } else {
-        oldField = '';
-        down = false;
-    }
-
     if (field == 'IP') {
         someArray.sort((a, b) => sortIP(a, b, down));
     } else {