diff --git a/src/gui/panels/timeline-panel.cpp b/src/gui/panels/timeline-panel.cpp
index fc4e7387e..afb8b2d5c 100644
--- a/src/gui/panels/timeline-panel.cpp
+++ b/src/gui/panels/timeline-panel.cpp
@@ -30,8 +30,17 @@ namespace gui {
 namespace panels {
 
 TimelinePanel::TimelinePanel() :
-  Panel("timeline", _("Timeline"), "timeline_panel")
+  Panel("timeline", _("Timeline"), "timeline_panel"),
+  button(Stock::OK)
   {
+    // Setup the toolbar
+    toolbar.append(button);
+    
+    toolbar.set_icon_size(IconSize(ICON_SIZE_MENU));
+    toolbar.set_toolbar_style(TOOLBAR_ICONS);
+    
+    // Add the toolbar
+    pack_start(toolbar, PACK_SHRINK);
     pack_start(timeline_widget, PACK_EXPAND_WIDGET);
   }
 
diff --git a/src/gui/panels/timeline-panel.hpp b/src/gui/panels/timeline-panel.hpp
index bc1fbff08..b76a99622 100644
--- a/src/gui/panels/timeline-panel.hpp
+++ b/src/gui/panels/timeline-panel.hpp
@@ -41,7 +41,13 @@ namespace panels {
       TimelinePanel();
 
     protected:
+    
+      // Widgets
+      Gtk::Toolbar toolbar;
       TimelineWidget timeline_widget;
+      
+      // Toolbar Widgets
+      Gtk::ToolButton button;
     };
 
 }   // namespace panels