diff --git a/_layouts/base.html b/_layouts/base.html
index 14c439d1..f83f615d 100644
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -39,11 +39,13 @@ if(typeof(legacyIE)==='undefined'){
     <ul class="lang">
       <li><a href="#" onclick="return false;">{{ site.langs[page.lang] }}</a>
       <ul>
-        {% for lang in site.langsorder %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' class="active"'%}{% endif %}
-        {% cycle 'start': '<li><ul>', '', '', '', '', '', '', '', '', '', '' %}
+        <li><ul>
+        {% assign i = 0 %}{% assign c = site.langsorder.size | divided_by: 2 | plus: 1 %}
+        {% for lang in site.langsorder %}{% assign mod = i | modulo: c %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' class="active"'%}{% endif %}
+        {% if mod == 0 and i != 0 %}</li></ul><li><ul>{% endif %}
           <li><a href="/{{ lang }}/{% translate {{page.id}} url {{lang}} %}"{{ active }}>{{ site.langs[lang] }}</a></li>
-        {% cycle 'end': '', '', '', '', '', '', '', '', '', '', '</ul></li>' %}{% endfor %}
-        {% cycle 'end': '', '</ul></li>', '</ul></li>', '</ul></li>', '</ul></li>', '</ul></li>', '</ul></li>', '</ul></li>', '</ul></li>', '</ul></li>', '</ul></li>' %}
+        {% assign i = i | plus: 1 %}{% endfor %}
+        </ul></li>
       </ul>
       </li>
     </ul>