Index: gtk2_ardour/plugin_ui.cc
===================================================================
--- gtk2_ardour/plugin_ui.cc	(revision 11340)
+++ gtk2_ardour/plugin_ui.cc	(working copy)
@@ -156,11 +156,6 @@
 
 	if (scrollable) {
 		if (h > 600) h = 600;
-		if (w > 600) w = 600;
-
-		if (w < 0) {
-			w = 450;
-		}
 	}
 
 	set_default_size (w, h);
Index: gtk2_ardour/generic_pluginui.cc
===================================================================
--- gtk2_ardour/generic_pluginui.cc	(revision 11340)
+++ gtk2_ardour/generic_pluginui.cc	(working copy)
@@ -113,7 +113,7 @@
 	main_contents.pack_start (*constraint_hbox, false, false);
 
 	if (is_scrollable ) {
-		scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+		scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
 		scroller.set_name ("PluginEditor");
 		scroller_view.set_name("PluginEditor");
 		scroller_view.add (hpacker);