diff --git a/ckan/public/base/less/footer.less b/ckan/public/base/less/footer.less
index db43367b2e0..7457b818f15 100644
--- a/ckan/public/base/less/footer.less
+++ b/ckan/public/base/less/footer.less
@@ -46,6 +46,17 @@
   text-indent: -900em;
 }
 
+.lang-select {
+  .clearfix;
+}
+
+.lang-select label,
+.lang-select select,
+.lang-select .lang-container {
+  float: left;
+  margin-top: 0;
+}
+
 .lang-dropdown {
   color: #000;
 }
@@ -162,5 +173,4 @@
   &[data-value*="/pt_BR/"]:before {
     background-position: 0 -132px;
   }
-
 }
diff --git a/ckan/templates/snippets/language_selector.html b/ckan/templates/snippets/language_selector.html
index 7a1d478ce37..dfe62c1686a 100644
--- a/ckan/templates/snippets/language_selector.html
+++ b/ckan/templates/snippets/language_selector.html
@@ -1,8 +1,8 @@
 {% set current_url = request.environ.CKAN_CURRENT_URL %}
 {% set current_lang = request.environ.CKAN_LANG %}
-<form class="form-inline form-select" action="{% url_for controller='util', action='redirect' %}" data-module="select-switch" method="POST">
+<form class="form-inline form-select lang-select" action="{% url_for controller='util', action='redirect' %}" data-module="select-switch" method="POST">
   <label for="field-lang-select">{{ _('Language') }}</label>
-  <select id="field-lang-select" name="url" data-module="autocomplete" data-module-dropdown-class="lang-dropdown">
+  <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 current_url, locale=locale %}" {% if locale == current_lang %}selected="selected"{% endif %}>
         {{ locale.display_name or locale.english_name }}