diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index 3217e2e81f..61895896d2 100644
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -213,13 +213,13 @@ IOSelector::channel_noun () const
 }
 
 IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, boost::shared_ptr<ARDOUR::IO> io, bool /*can_cancel*/)
-	: _selector (this, session, io)
+	: ArdourDialog (_("I/O selector"))
+        , _selector (this, session, io)
 {
 	set_name ("IOSelectorWindow2");
-	set_title (_("I/O selector"));
-
-	add (_selector);
 
+	get_vbox()->pack_start (_selector);
+        
 	set_position (Gtk::WIN_POS_MOUSE);
 
 	io_name_changed (this);
diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h
index c3500f1a1d..bb103d0d5d 100644
--- a/gtk2_ardour/io_selector.h
+++ b/gtk2_ardour/io_selector.h
@@ -21,6 +21,7 @@
 #define __gtkardour_io_selector_h__
 
 #include "port_matrix.h"
+#include "ardour_dialog.h"
 
 class IOSelector : public PortMatrix
 {
@@ -66,7 +67,7 @@ class IOSelector : public PortMatrix
 	PBD::ScopedConnection _io_connection;
 };
 
-class IOSelectorWindow : public Gtk::Window
+class IOSelectorWindow : public ArdourDialog
 {
   public:
 	IOSelectorWindow (ARDOUR::Session *, boost::shared_ptr<ARDOUR::IO>, bool can_cancel = false);