diff --git a/gtk2_ardour/waves_export_dialog.cc b/gtk2_ardour/waves_export_dialog.cc
index 7d527476a7..b58c4de8ac 100644
--- a/gtk2_ardour/waves_export_dialog.cc
+++ b/gtk2_ardour/waves_export_dialog.cc
@@ -116,7 +116,13 @@ WavesExportDialog::set_session (ARDOUR::Session* s)
 			profile_manager->duplicate_filename_state (filenames.front ());
 		}
 	}
-
+    if (formats.size()) {
+        ExportProfileManager::FormatStatePtr state = formats.front ();
+        if (!state->format ) {
+            state->format = state->list->front ();
+        }
+    }
+    
 	sync_with_manager ();
 
 	/* Warnings */
diff --git a/gtk2_ardour/waves_export_file_notebook.cc b/gtk2_ardour/waves_export_file_notebook.cc
index 983c69fc89..f9339d4cb8 100644
--- a/gtk2_ardour/waves_export_file_notebook.cc
+++ b/gtk2_ardour/waves_export_file_notebook.cc
@@ -67,7 +67,9 @@ WavesExportFileNotebook::sync_with_manager ()
 	ExportProfileManager::FilenameStateList::const_iterator filename_it = filenames.begin ();
 
 	if (_format_file_page) {
+        _format_file_page_home.remove (*_format_file_page);
 		remove_file_page (_format_file_page);
+        _format_file_page = 0;
 	}
 
 	// Lossless formats page:
diff --git a/gtk2_ardour/waves_export_format_selector.cc b/gtk2_ardour/waves_export_format_selector.cc
index 971823b918..34923a5db4 100644
--- a/gtk2_ardour/waves_export_format_selector.cc
+++ b/gtk2_ardour/waves_export_format_selector.cc
@@ -40,10 +40,6 @@ WavesExportFormatSelector::WavesExportFormatSelector ()
 	_sample_rate_dropdown.selected_item_changed.connect (sigc::mem_fun (*this, &WavesExportFormatSelector::on_sample_rate_dropdown));
 	_dithering_dropdown.selected_item_changed.connect (sigc::mem_fun (*this, &WavesExportFormatSelector::on_dithering_dropdown));
 	_normalize_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportFormatSelector::on_normalize_button));
-
-	/* Sorted contents for dropdown */
-	format_list = Gtk::ListStore::create (format_cols);
-    format_list->set_sort_column (format_cols.label, Gtk::SORT_ASCENDING);
 }
 
 WavesExportFormatSelector::~WavesExportFormatSelector ()
diff --git a/gtk2_ardour/waves_export_format_selector.h b/gtk2_ardour/waves_export_format_selector.h
index 5a17548a9e..6d4ef9c625 100644
--- a/gtk2_ardour/waves_export_format_selector.h
+++ b/gtk2_ardour/waves_export_format_selector.h
@@ -91,17 +91,6 @@ class WavesExportFormatSelector : public Gtk::VBox, public WavesUI, public ARDOU
 
 	/*** GUI componenets ***/
 
-	struct FormatCols : public Gtk::TreeModelColumnRecord
-	{
-	  public:
-		Gtk::TreeModelColumn<FormatPtr>    format;
-		Gtk::TreeModelColumn<std::string>  label;
-
-		FormatCols () { add (format); add (label); }
-	};
-	FormatCols                   format_cols;
-	Glib::RefPtr<Gtk::ListStore> format_list;
-
 	WavesDropdown& _format_dropdown;
 	WavesDropdown& _depth_dropdown;
 	WavesDropdown& _sample_rate_dropdown;