diff --git a/ckanext/kepa/assets/css/kepa.css b/ckanext/kepa/assets/css/kepa.css
index 4ce631b..bf8c201 100644
--- a/ckanext/kepa/assets/css/kepa.css
+++ b/ckanext/kepa/assets/css/kepa.css
@@ -243,4 +243,19 @@
   text-shadow: none;
 }
 
+.language {
+  border-left: none !important;
+  height: 30px;
+}
+
+.lang-select {
+  width: 60px;
+}
+
+.list-unstyled {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
 /*# sourceMappingURL=kepa.css.map */
diff --git a/ckanext/kepa/assets/css/kepa.css.map b/ckanext/kepa/assets/css/kepa.css.map
index 415e3c7..195c481 100644
--- a/ckanext/kepa/assets/css/kepa.css.map
+++ b/ckanext/kepa/assets/css/kepa.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/kepa.scss","../scss/_mixins.scss","../scss/_variables.scss"],"names":[],"mappings":"AAGA;ECFI;EACA;EACA;;;ADIJ;ECKI;EACA;;;ADFJ;EACI;EACA,kBEbY;;;AFgBhB;EACI,OEZI;EFaJ,aEXG;EFYH,WEXQ;;;AFcZ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAEJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;ECxCA;EACA;EDyCA;EC/CA;EACA;;;ADkDJ;EACI;;;AAGJ;EACI;IACI;;;AAIR;EACI,OEhEI;EFiEJ,WE7DO;EF8DP;;;AAGJ;ECzEI;EACA;EACA;EDyEA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI,OE5FI;;;AF+FR;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;IACI;;;AAIR;EACI,kBEpHI;EFqHJ;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;ECpIA;EACA;EDqIA,kBE5Ic;;;AF+IlB;EACI,OE5II;EF6IJ;ECtIA;EACA;EDuIA;EACA;;;AAGJ;EACI,WE/IQ;EFgJR;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;IACI;IACA;;;EAGJ;IACI;;;AAIR;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI,OEnLI;EFoLJ;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA,OEjMI;EFkMJ,aEhMG;EFiMH;;;AAGJ;EACI;IACI;;;AAIR;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI,kBE1Nc;EF2Nd;EACA;;;AAGJ;EACI,OEhOc;;;AFmOlB;EACI;EACA,kBEtOY;;;AFyOhB;EACI;;;AAGJ;EACI;EACA","file":"kepa.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/kepa.scss","../scss/_mixins.scss","../scss/_variables.scss"],"names":[],"mappings":"AAGA;ECFI;EACA;EACA;;;ADIJ;ECKI;EACA;;;ADFJ;EACI;EACA,kBEbY;;;AFgBhB;EACI,OEZI;EFaJ,aEXG;EFYH,WEXQ;;;AFcZ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAEJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;ECxCA;EACA;EDyCA;EC/CA;EACA;;;ADkDJ;EACI;;;AAGJ;EACI;IACI;;;AAIR;EACI,OEhEI;EFiEJ,WE7DO;EF8DP;;;AAGJ;ECzEI;EACA;EACA;EDyEA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI,OE5FI;;;AF+FR;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;IACI;;;AAIR;EACI,kBEpHI;EFqHJ;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;ECpIA;EACA;EDqIA,kBE5Ic;;;AF+IlB;EACI,OE5II;EF6IJ;ECtIA;EACA;EDuIA;EACA;;;AAGJ;EACI,WE/IQ;EFgJR;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;IACI;IACA;;;EAGJ;IACI;;;AAIR;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI,OEnLI;EFoLJ;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA,OEjMI;EFkMJ,aEhMG;EFiMH;;;AAGJ;EACI;IACI;;;AAIR;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI,kBE1Nc;EF2Nd;EACA;;;AAGJ;EACI,OEhOc;;;AFmOlB;EACI;EACA,kBEtOY;;;AFyOhB;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EC1PI;EACA;EACA","file":"kepa.css"}
\ No newline at end of file
diff --git a/ckanext/kepa/assets/scss/kepa.scss b/ckanext/kepa/assets/scss/kepa.scss
index b49511c..97fad92 100644
--- a/ckanext/kepa/assets/scss/kepa.scss
+++ b/ckanext/kepa/assets/scss/kepa.scss
@@ -239,3 +239,16 @@
     color: black;
     text-shadow: none;
 }
+
+.language {
+    border-left: none !important;
+    height: 30px;
+}
+
+.lang-select {
+    width: 60px;
+}
+
+.list-unstyled{
+    @include center-flex;
+}
\ No newline at end of file
diff --git a/ckanext/kepa/templates/header.html b/ckanext/kepa/templates/header.html
index 31d99f1..742fb10 100644
--- a/ckanext/kepa/templates/header.html
+++ b/ckanext/kepa/templates/header.html
@@ -6,6 +6,9 @@
     {% block header_account_container_content %} {% if c.userobj %}
     <div class="account avatar authed" data-module="me" data-me="{{ c.userobj.id }}">
       <ul class="list-unstyled">
+        <div class="language">
+          {% snippet "snippets/language_selector.html" %}
+        </div>
         {% block header_account_logged %} {% if c.userobj.sysadmin %}
         <li>
           <a href="{{ h.url_for('admin.index') }}" title="{{ _('Sysadmin settings') }}">
diff --git a/ckanext/kepa/templates/snippets/language_selector.html b/ckanext/kepa/templates/snippets/language_selector.html
new file mode 100644
index 0000000..7706414
--- /dev/null
+++ b/ckanext/kepa/templates/snippets/language_selector.html
@@ -0,0 +1,16 @@
+{% set current_lang = request.environ.CKAN_LANG %}
+<form class="lang-select" action="{% url_for 'util.internal_redirect' %}" data-module="select-switch" method="POST">
+  {{ h.csrf_input() }} 
+  <div class="form-group">
+    <select id="field-lang-select" name="url" data-module="autocomplete" data-module-dropdown-class="lang-dropdown" data-module-container-class="lang-container">
+      {% for locale in h.get_available_locales() %}
+        <option value="{% url_for h.current_url(), locale=locale.short_name %}" {% if locale.short_name == current_lang %}selected="selected"{% endif %}>
+          {{ locale.short_name or locale.english_name }}
+        </option>
+      {% endfor %}
+    </select>
+  </div>
+  <button class="btn btn-default d-none " type="submit">{{ _('Go') }}</button>
+</form>
+
+