diff --git a/src/gui/widgets/timeline/timeline-ibeam-tool.cpp b/src/gui/widgets/timeline/timeline-ibeam-tool.cpp
index 7672bcf01..59d5345be 100644
--- a/src/gui/widgets/timeline/timeline-ibeam-tool.cpp
+++ b/src/gui/widgets/timeline/timeline-ibeam-tool.cpp
@@ -49,11 +49,12 @@ IBeamTool::IBeamTool(TimelineBody &timeline_body) :
   scrollSlideRate(0)
 {
   // Connect the timlinebody selection to the selectionControl
-  this->get_state()->get_selection().accept(selectionControl);
+  this->get_state()->setSelection (selectionControl, false);
 }
 
 IBeamTool::~IBeamTool()
 {
+  selectionControl.disconnect();
   end_scroll_slide();
 }
 
diff --git a/src/gui/widgets/timeline/timeline-state.hpp b/src/gui/widgets/timeline/timeline-state.hpp
index 6446e7790..0d0b02a32 100644
--- a/src/gui/widgets/timeline/timeline-state.hpp
+++ b/src/gui/widgets/timeline/timeline-state.hpp
@@ -78,6 +78,7 @@ public:
   
   Time getPlaybackPoint()       const { return playbackPoint_; }
   
+  
   /** is there currently any ongoing playback process?
    *  Otherwise the #getPlaybackPoint is meaningless */
   bool isPlaying() const { return isPlayback_; }