diff --git a/src/gui/widgets/timeline/timeline-body.cpp b/src/gui/widgets/timeline/timeline-body.cpp
index 369b894ed..e64110997 100644
--- a/src/gui/widgets/timeline/timeline-body.cpp
+++ b/src/gui/widgets/timeline/timeline-body.cpp
@@ -57,9 +57,12 @@ TimelineBody::TimelineBody (TimelineWidget &timelineWidget)
   timelineWidget.state_changed_signal().connect(
     sigc::mem_fun(this, &TimelineBody::on_state_changed) );
   
+  // Set a default Tool
+  this->set_tool(Arrow);
+
   // Install style properties
   register_styles();
-  
+
   // Reset the state
   propagateStateChange();
 }
@@ -96,10 +99,10 @@ TimelineBody::get_tool() const
 }
   
 void
-TimelineBody::set_tool(timeline::ToolType tool_type)
+TimelineBody::set_tool(timeline::ToolType tool_type, bool force)
 {  
   // Tidy up old tool
-  if(tool)
+  if(tool && !force)
     {
       // Do we need to change tools?
       if(tool->get_type() == tool_type)
@@ -322,7 +325,10 @@ TimelineBody::propagateStateChange()
       viewWindow().changed_signal().connect(
         sigc::mem_fun(this, &TimelineBody::on_update_view) );
     }
-    
+
+  // Need to reload the current tool...
+  set_tool (get_tool(), true);
+
   // Redraw
   queue_draw();
 }
diff --git a/src/gui/widgets/timeline/timeline-body.hpp b/src/gui/widgets/timeline/timeline-body.hpp
index 16b3b13e7..8abf01a3f 100644
--- a/src/gui/widgets/timeline/timeline-body.hpp
+++ b/src/gui/widgets/timeline/timeline-body.hpp
@@ -88,7 +88,7 @@ public:
    * @param tool_type The type of tool to set.
    */
   void
-  set_tool(ToolType tool_type);
+  set_tool(ToolType tool_type, bool force=false);
   
   /* ===== Events ===== */
 protected: