diff --git a/gtk2_ardour/io_plugin_window.cc b/gtk2_ardour/io_plugin_window.cc
index c1656bf25a..61f3866e32 100644
--- a/gtk2_ardour/io_plugin_window.cc
+++ b/gtk2_ardour/io_plugin_window.cc
@@ -158,6 +158,7 @@ IOPluginWindow::PluginBox::PluginBox (bool is_pre)
 	_top.pack_start (_hbox, false, false);
 	_top.pack_end (_base, true, true);
 	add (_top);
+	set_size_request (-1, PX_SCALE (40));
 	show_all ();
 }
 
@@ -171,6 +172,7 @@ void
 IOPluginWindow::PluginBox::add_child (Gtk::Widget& w)
 {
 	_hbox.pack_start (w, false, false);
+	queue_resize ();
 }
 
 bool
@@ -349,9 +351,9 @@ IOPluginWindow::IOPlugUI::button_press_event (GdkEventButton* ev)
 		Gtk::Menu* m = ARDOUR_UI_UTILS::shared_popup_menu ();
 		MenuList& items = m->items ();
 
-		items.push_back (MenuElem (_("Edit.."), sigc::bind (sigc::mem_fun (*this, &IOPluginWindow::IOPlugUI::edit_plugin), false)));
+		items.push_back (MenuElem (_("Edit.."), sigc::bind (sigc::mem_fun (*this, &IOPluginWindow::IOPlugUI::edit_plugin), true)));
 		items.back().set_sensitive (_iop->plugin ()->has_editor ());
-		items.push_back (MenuElem (_("Edit with generic controls..."), sigc::bind (sigc::mem_fun (*this, &IOPluginWindow::IOPlugUI::edit_plugin), true)));
+		items.push_back (MenuElem (_("Edit with generic controls..."), sigc::bind (sigc::mem_fun (*this, &IOPluginWindow::IOPlugUI::edit_plugin), false)));
 		items.push_back (SeparatorElem());
 		items.push_back (MenuElem (_("Delete"), sigc::mem_fun (*this, &IOPluginWindow::IOPlugUI::self_remove)));