diff --git a/terminatorlib/editablelabel.py b/terminatorlib/editablelabel.py
index ef066fb2..7cdf7dd9 100644
--- a/terminatorlib/editablelabel.py
+++ b/terminatorlib/editablelabel.py
@@ -43,7 +43,7 @@ class EditableLabel(Gtk.EventBox):
         GObject.GObject.__init__(self) 
 
         self._entry_handler_id = []
-        self._label = Gtk.Label(label=text)
+        self._label = Gtk.Label(label=text, ellipsize='end')
         self._custom = False
         self.set_visible_window (False)
         self.add (self._label)  
diff --git a/terminatorlib/preferences.glade b/terminatorlib/preferences.glade
index f1a32013..5b520fe5 100644
--- a/terminatorlib/preferences.glade
+++ b/terminatorlib/preferences.glade
@@ -1209,26 +1209,32 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkTreeView" id="profilelist">
+                      <object class="GtkScrolledWindow" id="scrolledwindow3">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hadjustment">adjustment2</property>
-                        <property name="vadjustment">adjustment3</property>
-                        <property name="model">ProfilesListStore</property>
-                        <property name="headers_clickable">False</property>
-                        <property name="search_column">0</property>
+                        <property name="hscrollbar_policy">never</property>
                         <child>
-                          <object class="GtkTreeViewColumn" id="profilecolumn">
-                            <property name="title">Profile</property>
-                            <property name="clickable">True</property>
+                          <object class="GtkTreeView" id="profilelist">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hadjustment">adjustment2</property>
+                            <property name="vadjustment">adjustment3</property>
+                            <property name="model">ProfilesListStore</property>
+                            <property name="headers_clickable">False</property>
+                            <property name="search_column">0</property>
                             <child>
-                              <object class="GtkCellRendererText" id="cellrenderertext3">
-                                <signal name="edited" handler="on_profile_name_edited" swapped="no"/>
+                              <object class="GtkTreeViewColumn" id="profilecolumn">
+                                <property name="title">Profile</property>
+                                <property name="clickable">True</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="cellrenderertext3">
+                                    <signal name="edited" handler="on_profile_name_edited" swapped="no"/>
+                                  </object>
+                                  <attributes>
+                                    <attribute name="editable">1</attribute>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
                               </object>
-                              <attributes>
-                                <attribute name="editable">1</attribute>
-                                <attribute name="text">0</attribute>
-                              </attributes>
                             </child>
                           </object>
                         </child>
@@ -3144,25 +3150,31 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkTreeView" id="layoutlist">
+                      <object class="GtkScrolledWindow" id="scrolledwindow4">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hadjustment">adjustment5</property>
-                        <property name="vadjustment">adjustment6</property>
-                        <property name="model">LayoutListStore</property>
-                        <property name="search_column">0</property>
+                        <property name="hscrollbar_policy">never</property>
                         <child>
-                          <object class="GtkTreeViewColumn" id="layoutcolumn">
-                            <property name="title">Layout</property>
-                            <property name="clickable">True</property>
+                          <object class="GtkTreeView" id="layoutlist">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hadjustment">adjustment5</property>
+                            <property name="vadjustment">adjustment6</property>
+                            <property name="model">LayoutListStore</property>
+                            <property name="search_column">0</property>
                             <child>
-                              <object class="GtkCellRendererText" id="cellrenderertext12">
-                                <signal name="edited" handler="on_layout_name_edited" swapped="no"/>
+                              <object class="GtkTreeViewColumn" id="layoutcolumn">
+                                <property name="title">Layout</property>
+                                <property name="clickable">True</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="cellrenderertext12">
+                                    <signal name="edited" handler="on_layout_name_edited" swapped="no"/>
+                                  </object>
+                                  <attributes>
+                                    <attribute name="editable">1</attribute>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
                               </object>
-                              <attributes>
-                                <attribute name="editable">1</attribute>
-                                <attribute name="text">0</attribute>
-                              </attributes>
                             </child>
                           </object>
                         </child>
diff --git a/terminatorlib/titlebar.py b/terminatorlib/titlebar.py
index ef6d523f..6589ad7f 100755
--- a/terminatorlib/titlebar.py
+++ b/terminatorlib/titlebar.py
@@ -50,7 +50,7 @@ class Titlebar(Gtk.EventBox):
         self.label.connect('edit-done', self.on_edit_done)
         self.ebox = Gtk.EventBox()
         grouphbox = Gtk.HBox()
-        self.grouplabel = Gtk.Label()
+        self.grouplabel = Gtk.Label(ellipsize='end')
         self.groupicon = Gtk.Image()
         self.bellicon = Gtk.Image()
         self.bellicon.set_no_show_all(True)
@@ -85,8 +85,10 @@ class Titlebar(Gtk.EventBox):
         hbox.pack_start(self.label, True, True, 0)
         hbox.pack_end(self.bellicon, False, False, 2)
 
-        self.add(hbox)
-        hbox.show_all()
+        viewport = Gtk.Viewport(hscroll_policy='natural')
+        viewport.add(hbox)
+        self.add (viewport)
+        viewport.show_all()
         self.set_no_show_all(True)
         self.show()
 
diff --git a/terminatorlib/window.py b/terminatorlib/window.py
index c247446e..3a7ccccd 100755
--- a/terminatorlib/window.py
+++ b/terminatorlib/window.py
@@ -378,9 +378,8 @@ class Window(Container, Gtk.Window):
         if value:
             dbg('setting rgba visual')
             visual = screen.get_rgba_visual()
-
-        if visual:
-            self.set_visual(visual)
+            if visual:
+                self.set_visual(visual)
     
     def show(self, startup=False):
         """Undo the startup show request if started in hidden mode"""