diff --git a/allianceauth/theme/templates/theme/theme_select.html b/allianceauth/theme/templates/theme/theme_select.html
index 96fea987..c83b7726 100644
--- a/allianceauth/theme/templates/theme/theme_select.html
+++ b/allianceauth/theme/templates/theme/theme_select.html
@@ -1,9 +1,13 @@
+{% load i18n %}
+
 <form action="{% url 'theme' %}?next={{ next|urlencode }}" method="post">
     {% csrf_token %}
-    <select name="theme" value="theme" class="form-select" aria-label="" onchange="this.form.submit()">
-        <option selected>Select Theme</option>
+
+    <select name="theme" class="form-select" aria-label="" onchange="this.form.submit()">
+        <option selected>{% translate "Select Theme" %}</option>
+
         {% for theme in themes %}
-            <option value="{{ theme.get_name }}">{{ theme.name }}</option>
+            <option value="{{ theme.get_name }}"{% if selected_theme.name == theme.name %} selected="selected"{% endif %}>{{ theme.name }}</option>
         {% endfor %}
     </select>
 </form>
diff --git a/allianceauth/theme/templatetags/theme_tags.py b/allianceauth/theme/templatetags/theme_tags.py
index 4409c151..68a7ab4e 100644
--- a/allianceauth/theme/templatetags/theme_tags.py
+++ b/allianceauth/theme/templatetags/theme_tags.py
@@ -72,5 +72,6 @@ def theme_select(context):
     request = context['request']
     return {
         'next': request.path,
-        'themes': get_hooks('theme_hook')
+        'themes': get_hooks('theme_hook'),
+        'selected_theme': get_theme(request)
     }