diff --git a/store/templates/catalog.html b/store/templates/catalog.html
index e80221da..27114a2c 100644
--- a/store/templates/catalog.html
+++ b/store/templates/catalog.html
@@ -120,9 +120,9 @@
               id="selectsort"
               class="inline-block rounded-md border-gray-200 text-sm ml-1 pl-1 pr-7 h-8 py-0"
             >
-            <option {% if not init_sort %}selected{% endif %} value="">{{ _("Alphabetical") }}</option>
+            <option {% if not init_sort or init_sort == "popularity" %}selected{% endif %} value="popularity">{{ _("Popularity") }}</option>
             <option {% if init_sort == "newest" %}selected{% endif %} value="newest">{{ _("Newest") }}</option>
-            <option {% if init_sort == "popularity" %}selected{% endif %} value="popularity">{{ _("Popularity") }}</option>
+            <option {% if init_sort == "alpha" %}selected{% endif %} value="alpha">{{ _("Alphabetical") }}</option>
             </select>
         </div>
         <div class="inline-block flex items-center px-2 pt-2 md:pt-0 {% if not user %}text-gray-500{% endif %}" {% if not user %}title="{{ _('Requires to be logged-in') }}" aria-label="{{ _('Requires to be logged-in') }}"{% endif %}>
@@ -242,7 +242,7 @@
                 return parseInt(a.dataset.stars) < parseInt(b.dataset.stars) ? 1 : -1;
             });
         }
-        else if (sortBy === "") {
+        else if (sortBy === "alpha") {
             toSort.sort(function(a, b) {
                 return a.dataset.appid > b.dataset.appid ? 1 : -1;
             });
@@ -267,7 +267,7 @@
             var queryArgs = new URLSearchParams(window.location.search)
             if (search_query) { queryArgs.set("search", search_query) } else { queryArgs.delete("search"); };
             if (category) { queryArgs.set("category", category) } else { queryArgs.delete("category"); };
-            if (sortBy) { queryArgs.set("sort", sortBy) } else { queryArgs.delete("sort"); };
+            if (sortBy != "popularity") { queryArgs.set("sort", sortBy) } else { queryArgs.delete("sort"); };
             if (starsOnly) { queryArgs.set("starsonly", true) } else { queryArgs.delete("starsonly"); };
 
             let newUrl;
diff --git a/store/templates/wishlist.html b/store/templates/wishlist.html
index 7843aec0..4da05a08 100644
--- a/store/templates/wishlist.html
+++ b/store/templates/wishlist.html
@@ -42,8 +42,8 @@
               id="selectsort"
               class="inline-block rounded-md border-gray-200 text-sm ml-1 pl-1 pr-7 h-8 py-0"
             >
-            <option {% if not init_sort %}selected{% endif %} value="">{{ _("Alphabetical") }}</option>
-            <option {% if init_sort == "popularity" %}selected{% endif %} value="popularity">{{ _("Popularity") }}</option>
+            <option {% if not init_sort or init_sort == "popularity" %}selected{% endif %} value="popularity">{{ _("Popularity") }}</option>
+            <option {% if init_sort == "alpha" %}selected{% endif %} value="alpha">{{ _("Alphabetical") }}</option>
             </select>
         </div>
         <div class="inline-block flex items-center px-2 pt-2 md:pt-0 {% if not user %}text-gray-500{% endif %}" {% if not user %}title="{{ _('Requires to be logged-in') }}" aria-label="{{ _('Requires to be logged-in') }}"{% endif %}>
@@ -216,7 +216,7 @@
                 return parseInt(a.dataset.stars) < parseInt(b.dataset.stars) ? 1 : -1;
             });
         }
-        else if (sortBy === "") {
+        else if (sortBy === "alpha") {
             toSort.sort(function(a, b) {
                 return a.dataset.appid > b.dataset.appid ? 1 : -1;
             });
@@ -240,7 +240,7 @@
             var queryArgs = new URLSearchParams(window.location.search)
             if (search_query) { queryArgs.set("search", search_query) } else { queryArgs.delete("search"); };
             if (category) { queryArgs.set("category", category) } else { queryArgs.delete("category"); };
-            if (sortBy) { queryArgs.set("sort", sortBy) } else { queryArgs.delete("sort"); };
+            if (sortBy != "popularity") { queryArgs.set("sort", sortBy) } else { queryArgs.delete("sort"); };
             if (starsOnly) { queryArgs.set("starsonly", true) } else { queryArgs.delete("starsonly"); };
 
             let newUrl;