diff --git a/src/riotTags/main-menu.tag b/src/riotTags/main-menu.tag
index 1cf9c91e6..f068820fd 100644
--- a/src/riotTags/main-menu.tag
+++ b/src/riotTags/main-menu.tag
@@ -101,7 +101,8 @@ main-menu.flexcol
         };
 
         const languageSubmenu = {
-            items: []
+            items: [],
+            columns: 2
         };
         const recentProjectsSubmenu = {
             items: []
diff --git a/src/riotTags/shared/context-menu.tag b/src/riotTags/shared/context-menu.tag
index 8e41c8a38..eb820d73e 100644
--- a/src/riotTags/shared/context-menu.tag
+++ b/src/riotTags/shared/context-menu.tag
@@ -5,7 +5,8 @@
         Expects a following structure:
         {
             opened: boolean, // mutable by a context-menu instance
-            items: Array<IMenuItem>
+            items: Array<IMenuItem>,
+            columns: number
         }
         IMenuItem is:
         {
@@ -27,7 +28,7 @@
     @method open
     @method close
 
-context-menu(class="{opened: opts.menu.opened}" ref="root")
+context-menu(class="{opened: opts.menu.opened}" ref="root" style="{opts.menu.columns? 'columns: '+opts.menu.columns+';' : ''}")
     a(
         each="{item in opts.menu.items}"
         href="javascript: void 0;"
diff --git a/src/styl/tags/shared/context-menu.styl b/src/styl/tags/shared/context-menu.styl
index 688976060..d35bb1266 100644
--- a/src/styl/tags/shared/context-menu.styl
+++ b/src/styl/tags/shared/context-menu.styl
@@ -30,6 +30,7 @@ context-menu
         left 100%
         top 0
     a, context-menu a
+        break-inside avoid
         color text
         {trans}
         &:first-child