diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index ffd7d34f4..13424e5e8 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -1,15 +1,7 @@
 <header class="<%= header_css %>">
   <section class="top-links">
     <div class="row">
-      <div class="language">
-        <span id="locale-switcher">
-          <%= t("layouts.header.language") %>
-          [
-            <% available_locales_to_switch.each do |locale| %>
-              <%= link_to(locale, params.merge(locale: locale), id: "locale-link-#{locale}") %>
-            <% end %>
-          ]
-      </div>
+      <%= render 'shared/locale_switcher' %>
     </div>
   </section>
 
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 53899221e..b47de5f24 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,15 +1,7 @@
 <header class="<%= header_css %>">
   <section class="top-links">
     <div class="row">
-      <div class="language">
-        <span id="locale-switcher">
-          <%= t("layouts.header.language") %>
-          [
-            <% available_locales_to_switch.each do |locale| %>
-              <%= link_to(locale, params.merge(locale: locale), id: "locale-link-#{locale}", data: { no_turbolink: true }) %>
-            <% end %>
-          ]
-      </div>
+      <%= render 'shared/locale_switcher' %>
       <div class="external-links">
         <%= link_to t("layouts.header.participation"), root_path, class: "selected" %>&nbsp;|
         <%= link_to t("layouts.header.external_link_transparency"), "#" %>&nbsp;|
diff --git a/app/views/shared/_locale_switcher.html.erb b/app/views/shared/_locale_switcher.html.erb
new file mode 100644
index 000000000..3ab2b0a98
--- /dev/null
+++ b/app/views/shared/_locale_switcher.html.erb
@@ -0,0 +1,10 @@
+<div class="locale">
+  <span>
+    <%= t("layouts.header.language") %>
+    <form>
+      <select class="js-locale-switcher" name='locale-switcher'>
+        <%= available_locale_options_for_select %>
+      </select>
+    </form>
+  </span>
+</div>