diff --git a/src/gui/widgets/timeline-widget.cpp b/src/gui/widgets/timeline-widget.cpp
index da5a8a142..341f50ad3 100644
--- a/src/gui/widgets/timeline-widget.cpp
+++ b/src/gui/widgets/timeline-widget.cpp
@@ -331,7 +331,7 @@ TimelineWidget::measure_branch_height(Track* track)
 {
   REQUIRE(track != NULL);
   
-  int height = track->get_height();
+  int height = track->get_height() + TrackPadding;
   
   // Recurse through all the children
   BOOST_FOREACH( Track* child, track->get_child_tracks() )
diff --git a/src/gui/widgets/timeline/timeline-body.cpp b/src/gui/widgets/timeline/timeline-body.cpp
index e04f771fa..2d9920e99 100644
--- a/src/gui/widgets/timeline/timeline-body.cpp
+++ b/src/gui/widgets/timeline/timeline-body.cpp
@@ -304,8 +304,7 @@ TimelineBody::draw_track_recursive(Cairo::RefPtr<Cairo::Context> cr,
   ASSERT(height >= 0);
 
   // Draw the track background
-  cr->rectangle(0, 0, view_width,
-    height - TimelineWidget::TrackPadding);
+  cr->rectangle(0, 0, view_width, height);
   GdkColor colour = backgroundColour;   // Needed to preserve const qualifier
   gdk_cairo_set_source_color(cr->cobj(), &colour);
   cr->fill();
@@ -316,7 +315,7 @@ TimelineBody::draw_track_recursive(Cairo::RefPtr<Cairo::Context> cr,
   cr->restore();
   
   // Shift for the next track
-  cr->translate(0, height);
+  cr->translate(0, height  + TimelineWidget::TrackPadding);
   
   // Recurse drawing into children
   BOOST_FOREACH( Track* child, track->get_child_tracks() )
diff --git a/src/gui/widgets/timeline/timeline-header-container.cpp b/src/gui/widgets/timeline/timeline-header-container.cpp
index ebe8d96b9..50e518b03 100644
--- a/src/gui/widgets/timeline/timeline-header-container.cpp
+++ b/src/gui/widgets/timeline/timeline-header-container.cpp
@@ -310,7 +310,7 @@ TimelineHeaderContainer::layout_headers_recursive(Track *track,
         indent,                                               // x
         offset,                                               // y
         max( header_width - indent, 0 ),                      // width
-        track_height - TimelineWidget::TrackPadding);         // height
+        track_height);                                        // height
       ASSERT(header_box.get_height() >= 0);
       
       // Cache the bounding box
@@ -330,7 +330,7 @@ TimelineHeaderContainer::layout_headers_recursive(Track *track,
         widget.show();
       
       // Offset for the next header
-      offset += track_height;
+      offset += track_height + TimelineWidget::TrackPadding;
     }
   else
     if(widget.is_visible())