diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 3b23957dcf..2d1538ca43 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3369,7 +3369,7 @@ Editor::setup_toolbar ()
 	toolbar_hbox.pack_start (snap_box, false, false);
 	toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
 	toolbar_hbox.pack_start (*nudge_box, false, false);
-	toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
+	toolbar_hbox.pack_start (_draw_box_spacer, false, false, 3);
 	toolbar_hbox.pack_start (draw_box, false, false);
 	toolbar_hbox.pack_end (_zoom_box, false, false, 2);
 	toolbar_hbox.pack_end (*(manage (new ArdourVSpacer ())), false, false, 3);
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index cfa11b0fdc..e07f258f74 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -65,6 +65,7 @@
 
 #include "widgets/ardour_button.h"
 #include "widgets/ardour_dropdown.h"
+#include "widgets/ardour_spacer.h"
 #include "widgets/pane.h"
 
 #include "ardour_dialog.h"
@@ -1975,6 +1976,8 @@ private:
 	Gtk::HBox snap_box;
 	Gtk::HBox draw_box;
 
+	ArdourWidgets::ArdourVSpacer _draw_box_spacer;
+
 	Gtk::HBox ebox_hpacker;
 	Gtk::VBox ebox_vpacker;
 
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 8879a7ba5f..f32aaab4dc 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -369,8 +369,10 @@ Editor::mouse_mode_toggled (MouseMode m)
 
 	if (mouse_mode == MouseDraw) {
 		draw_box.show();
+		_draw_box_spacer.show();
 	} else {
 		draw_box.hide();
+		_draw_box_spacer.hide();
 	}