diff --git a/allianceauth/menu/templates/menu/menu-user.html b/allianceauth/menu/templates/menu/menu-user.html
index b98d5174..6932fd87 100644
--- a/allianceauth/menu/templates/menu/menu-user.html
+++ b/allianceauth/menu/templates/menu/menu-user.html
@@ -50,6 +50,7 @@
                         {% theme_select %}
                     </a>
                 </li>
+                {% theme_select %}
 
                 {% if user.is_superuser %}
                     <li><hr class="dropdown-divider"></li>
diff --git a/allianceauth/theme/templates/theme/theme_select.html b/allianceauth/theme/templates/theme/theme_select.html
index c83b7726..7e94d1c5 100644
--- a/allianceauth/theme/templates/theme/theme_select.html
+++ b/allianceauth/theme/templates/theme/theme_select.html
@@ -1,13 +1,21 @@
 {% load i18n %}
 
-<form action="{% url 'theme' %}?next={{ next|urlencode }}" method="post">
-    {% csrf_token %}
+{% if themes|length > 1 %}
+    <li><h6 class="dropdown-header">{% translate "Theme" %}</h6></li>
 
-    <select name="theme" class="form-select" aria-label="" onchange="this.form.submit()">
-        <option selected>{% translate "Select Theme" %}</option>
+    <li>
+        <form class="dropdown-item" action="{% url 'theme' %}?next={{ next|urlencode }}" method="post">
+            {% csrf_token %}
 
-        {% for theme in themes %}
-            <option value="{{ theme.get_name }}"{% if selected_theme.name == theme.name %} selected="selected"{% endif %}>{{ theme.name }}</option>
-        {% endfor %}
-    </select>
-</form>
+            <select name="theme" class="form-select" onchange="this.form.submit()">
+                <option selected>{% translate "Select Theme" %}</option>
+
+                {% for theme in themes %}
+                    <option value="{{ theme.get_name }}"{% if selected_theme.name == theme.name %} selected="selected"{% endif %}>
+                        {{ theme.name }}
+                    </option>
+                {% endfor %}
+            </select>
+        </form>
+    </li>
+{% endif %}