diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 9ff0190918..b1bfe31afa 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2557,7 +2557,6 @@ ARDOUR_UI::edit_metadata ()
 {
 	SessionMetadataEditor dialog;
 	dialog.set_session (_session);
-	editor->ensure_float (dialog);
 	Keyboard::magic_widget_grab_focus ();
 	dialog.grab_focus ();
 	dialog.run ();
@@ -2569,7 +2568,6 @@ ARDOUR_UI::import_metadata ()
 {
 	SessionMetadataImporter dialog;
 	dialog.set_session (_session);
-	editor->ensure_float (dialog);
 	dialog.run ();
 }
 
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index b7bdeb0a65..118306c29c 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -474,7 +474,7 @@ RouteUI::edit_output_configuration ()
 		output_selector->present ();
 	}
 
-	output_selector->set_keep_above (true);
+	//output_selector->set_keep_above (true);
 }
 
 void
@@ -490,7 +490,7 @@ RouteUI::edit_input_configuration ()
 		input_selector->present ();
 	}
 
-	input_selector->set_keep_above (true);
+	//input_selector->set_keep_above (true);
 }
 
 bool