diff --git a/src/gui/widgets/timeline/timeline-header-widget.cpp b/src/gui/widgets/timeline/timeline-header-widget.cpp
index d11f96ce1..b71c6c8ad 100644
--- a/src/gui/widgets/timeline/timeline-header-widget.cpp
+++ b/src/gui/widgets/timeline/timeline-header-widget.cpp
@@ -208,7 +208,7 @@ TimelineHeaderWidget::on_button_release_event (GdkEventButton* event)
   TimelineLayoutHelper &layout = track.timelineWidget.layoutHelper;
   
   // Did the user release the button on an expander?
-  if(clickedExpander)
+  if(clickedExpander && !layout.is_dragging_track())
     {
       // Yes? The toggle the expanding
       track.expand_collapse(track.get_expanded() ?