diff --git a/src/gui/widgets/timeline/timeline-header-container.cpp b/src/gui/widgets/timeline/timeline-header-container.cpp
index 7641c69d2..54ad4f0f7 100644
--- a/src/gui/widgets/timeline/timeline-header-container.cpp
+++ b/src/gui/widgets/timeline/timeline-header-container.cpp
@@ -79,17 +79,12 @@ TimelineHeaderContainer::update_headers()
   pair<shared_ptr<model::Track>, shared_ptr<timeline::Track> > pair; 
   BOOST_FOREACH( pair, timelineWidget.trackMap )
     {
-      REQUIRE(pair.first);
-      
-      Widget &widget = lookup_timeline_track(pair.first)->
-        get_header_widget();
-      
-      const Container *parent = widget.get_parent();
-      if(parent == NULL)  // Is the header unparented?
+      REQUIRE(pair.second);
+      Widget &widget = pair.second->get_header_widget();
+      if(widget.get_parent() == NULL)  // Is the header unparented?
         widget.set_parent(*this);
       ENSURE(widget.get_parent() == this);
     }
-  
 }
   
 void