diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index 010e741cee..bc5eb19287 100644
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -478,6 +478,10 @@ KeyEditor::Tab::tab_mapped ()
 {
 	data_model->set_sort_column (owner.sort_column,  owner.sort_type);
 	filter->refilter ();
+
+	if (data_model->children().size() == 1) {
+		view.expand_all ();
+	}
 }
 
 bool