diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 560c2dc15f..33ad517952 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -179,9 +179,10 @@ AudioTimeAxisView::append_extra_display_menu_items ()
 	MenuList& items = display_menu->items();
 
 	// crossfade stuff
-	if (!Profile->get_sae()) {
+	if (!Profile->get_sae() && is_track ()) {
 		items.push_back (MenuElem (_("Hide All Crossfades"), sigc::mem_fun(*this, &AudioTimeAxisView::hide_all_xfades)));
 		items.push_back (MenuElem (_("Show All Crossfades"), sigc::mem_fun(*this, &AudioTimeAxisView::show_all_xfades)));
+		items.push_back (SeparatorElem ());
 	}
 }
 
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 91bc3157f1..f85a006c4f 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -349,6 +349,8 @@ MidiTimeAxisView::append_extra_display_menu_items ()
 
 	items.push_back (CheckMenuElem (_("MIDI Thru"), sigc::mem_fun(*this, &MidiTimeAxisView::toggle_midi_thru)));
 	_midi_thru_item = dynamic_cast<CheckMenuItem*>(&items.back());
+
+	items.push_back (SeparatorElem ());
 }
 
 Gtk::Menu*
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 3f9e40cf76..f087e1fccc 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -458,7 +458,6 @@ RouteTimeAxisView::build_display_menu ()
 
 	// Hook for derived classes to add type specific stuff
 	append_extra_display_menu_items ();
-	items.push_back (SeparatorElem());
 
 	if (is_track()) {