diff --git a/src/client/sidebar/sidebar-tree.vala b/src/client/sidebar/sidebar-tree.vala
index 38a3dc7..407f5e7 100644
--- a/src/client/sidebar/sidebar-tree.vala
+++ b/src/client/sidebar/sidebar-tree.vala
@@ -6,6 +6,8 @@
 
 public class Sidebar.Tree : Gtk.TreeView {
     public const int ICON_SIZE = 16;
+    private const int HEADER_PADDING = 3;
+    private const int DEFAULT_PADDING = 0;
     
     // Only one ExternalDropHandler can be registered with the Tree; it's responsible for completing
     // the "drag-data-received" signal properly.
@@ -108,6 +110,7 @@ public class Sidebar.Tree : Gtk.TreeView {
         text_renderer = new Gtk.CellRendererText();
         text_renderer.editing_canceled.connect(on_editing_canceled);
         text_renderer.editing_started.connect(on_editing_started);
+        text_column.set_cell_data_func(text_renderer, text_renderer_function);
         text_column.pack_start(text_renderer, true);
         text_column.add_attribute(text_renderer, "markup", Columns.NAME);
         append_column(text_column);
@@ -170,6 +173,14 @@ public class Sidebar.Tree : Gtk.TreeView {
         renderer.visible = !(wrapper.entry is Sidebar.Header);
     }
     
+    public void text_renderer_function(Gtk.CellLayout layout, Gtk.CellRenderer renderer, Gtk.TreeModel model, Gtk.TreeIter iter) {
+        EntryWrapper? wrapper = get_wrapper_at_iter(iter);
+        if (wrapper == null) {
+            return;
+        }
+        renderer.set("ypad", (wrapper.entry is Sidebar.Header) ? HEADER_PADDING : DEFAULT_PADDING);
+    }
+    
     private void on_drag_begin(Gdk.DragContext ctx) {
         is_internal_drag_in_progress = true;
     }
