diff --git a/ubl-settings-services.glade b/ubl-settings-services.glade
index c124c37..01455f3 100644
--- a/ubl-settings-services.glade
+++ b/ubl-settings-services.glade
@@ -950,6 +950,7 @@
                               <object class="GtkScrolledWindow">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
+                                <property name="hscrollbar-policy">never</property>
                                 <child>
                                   <object class="GtkTreeView" id="SystemUnitsTree">
                                     <property name="visible">True</property>
@@ -1566,6 +1567,7 @@
                               <object class="GtkScrolledWindow">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
+                                <property name="hscrollbar-policy">never</property>
                                 <child>
                                   <object class="GtkTreeView" id="UserUnitsTree">
                                     <property name="visible">True</property>
@@ -1681,7 +1683,9 @@
                                         <property name="clickable">True</property>
                                         <property name="sort-column-id">6</property>
                                         <child>
-                                          <object class="GtkCellRendererText"/>
+                                          <object class="GtkCellRendererText">
+                                            <property name="wrap-width">250</property>
+                                          </object>
                                           <attributes>
                                             <attribute name="text">5</attribute>
                                           </attributes>