diff --git a/gtk2_ardour/ardour_window.h b/gtk2_ardour/ardour_window.h
index a4c5aaa0e4..fe97855a49 100644
--- a/gtk2_ardour/ardour_window.h
+++ b/gtk2_ardour/ardour_window.h
@@ -37,7 +37,7 @@ namespace WM {
  * method of connecting and disconnecting from a Session with
  * all other objects that have a handle on a Session.
  */
-class ArdourWindow : public Gtk::Window, public ARDOUR::SessionHandlePtr, public Gtkmm2ext::VisibilityTracker
+class ArdourWindow : public Gtk::Window, public virtual ARDOUR::SessionHandlePtr, public Gtkmm2ext::VisibilityTracker
 {
 public:
 	ArdourWindow (std::string title);
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index be3414552a..1088d1d9b4 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -470,7 +470,7 @@ OptionEditorPage::OptionEditorPage (Gtk::Notebook& n, std::string const & t)
  *  @param o Configuration to edit.
  *  @param t Title for the dialog.
  */
-OptionEditor::OptionEditor (PBD::Configuration* c, std::string const & t)
+OptionEditor::OptionEditor (PBD::Configuration* c)
 	: _config (c)
 	, option_tree (TreeStore::create (option_columns))
 	, option_treeview (option_tree)
@@ -718,7 +718,7 @@ DirectoryOption::selection_changed ()
 /*--------------------------*/
 
 OptionEditorContainer::OptionEditorContainer (PBD::Configuration* c, string const& str)
-	: OptionEditor (c, str)
+	: OptionEditor (c)
 {
 	set_border_width (4);
 	hpacker.pack_start (treeview(), false, false);
@@ -730,7 +730,8 @@ OptionEditorContainer::OptionEditorContainer (PBD::Configuration* c, string cons
 }
 
 OptionEditorWindow::OptionEditorWindow (PBD::Configuration* c, string const& str)
-	: OptionEditor (c, str)
+	: OptionEditor (c)
+	, ArdourWindow (str)
 {
 	container.set_border_width (4);
 	hpacker.pack_start (treeview(), false, false);
diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index f29fe1ed47..e1b05b27e3 100644
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -683,10 +683,10 @@ public:
 };
 
 /** The OptionEditor dialog base class */
-class OptionEditor : public ARDOUR::SessionHandlePtr, virtual public sigc::trackable
+class OptionEditor : virtual public ARDOUR::SessionHandlePtr, virtual public sigc::trackable
 {
 public:
-	OptionEditor (PBD::Configuration *, std::string const &);
+	OptionEditor (PBD::Configuration *);
 	~OptionEditor ();
 
 	void add_option (std::string const &, OptionEditorComponent *);
@@ -737,7 +737,7 @@ private:
 };
 
 /** The OptionEditor dialog-as-container base class */
-class OptionEditorWindow : public OptionEditor, public Gtk::Window
+class OptionEditorWindow : public OptionEditor, public ArdourWindow
 {
 public:
 	OptionEditorWindow (PBD::Configuration *, std::string const &);