diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index 72207ea27f..07042a1cdf 100644
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -76,7 +76,10 @@ KeyEditor::KeyEditor ()
 	scroller.add (view);
 	scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
 
-	add (scroller);
+	add (vpacker);
+
+	vpacker.set_spacing (6);
+	vpacker.pack_start (scroller);
 
 	if (!ARDOUR::Profile->get_sae()) {
 
@@ -87,14 +90,17 @@ KeyEditor::KeyEditor ()
 		unbind_box.pack_start (unbind_button, false, false);
 		unbind_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::unbind));
 
-		add (unbind_box);
+		vpacker.pack_start (unbind_box, false, false);
 		unbind_box.show ();
 		unbind_button.show ();
 
 	}
 
+	vpacker.set_border_width (12);
+
 	view.show ();
 	scroller.show ();
+	vpacker.show ();
 
 	unbind_button.set_sensitive (false);
 }
diff --git a/gtk2_ardour/keyeditor.h b/gtk2_ardour/keyeditor.h
index 1fc3c44155..ba374c71b2 100644
--- a/gtk2_ardour/keyeditor.h
+++ b/gtk2_ardour/keyeditor.h
@@ -35,6 +35,7 @@ class KeyEditor : public ArdourWindow
 	    Gtk::TreeModelColumn<bool> bindable;
 	};
 
+        Gtk::VBox vpacker;
 	Gtk::ScrolledWindow scroller;
 	Gtk::TreeView view;
 	Glib::RefPtr<Gtk::TreeStore> model;