diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 94f392ae65..1967f734cc 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -186,7 +186,7 @@ def _config(): # {{{
     c.add_opt('enforce_cpu_limit', default=True,
             help=_('Limit max simultaneous jobs to number of CPUs'))
     c.add_opt('gui_layout', choices=['wide', 'narrow'],
-            help=_('The layout of the user interface.\nWide has the '
+            help=_('The layout of the user interface. Wide has the '
                 'book details panel on the right and narrow has '
                 'it at the bottom.'), default='wide')
     c.add_opt('show_avg_rating', default=True,
diff --git a/src/calibre/gui2/languages.py b/src/calibre/gui2/languages.py
index 1e192a0c94..3398081c5f 100644
--- a/src/calibre/gui2/languages.py
+++ b/src/calibre/gui2/languages.py
@@ -16,6 +16,8 @@ class LanguagesEdit(MultiCompleteComboBox):
     def __init__(self, parent=None):
         MultiCompleteComboBox.__init__(self, parent)
 
+        self.setSizeAdjustPolicy(self.AdjustToMinimumContentsLengthWithIcon)
+        self.setMinimumContentsLength(20)
         self._lang_map = lang_map()
         self.names_with_commas = [x for x in self._lang_map.itervalues() if ',' in x]
         self.comma_map = {k:k.replace(',', '|') for k in self.names_with_commas}