diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 00990aab58..8e0fdd4dee 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -572,6 +572,7 @@
       <menuitem action='toggle-bundle-manager'/>
 #endif
       <menuitem action='toggle-big-clock'/>
+      <menuitem action='toggle-mixer-snapshot'/>
       <menuitem action='toggle-big-transport'/>
       <menuitem action='toggle-transport-masters'/>
 #if 0
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index e75986083a..87e16cf778 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -520,6 +520,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 	WM::Manager::instance().register_window (&bundle_manager);
 	WM::Manager::instance().register_window (&location_ui);
 	WM::Manager::instance().register_window (&big_clock_window);
+	WM::Manager::instance().register_window (&mixer_snapshot_dialog);
 	WM::Manager::instance().register_window (&big_transport_window);
 	WM::Manager::instance().register_window (&virtual_keyboard_window);
 	WM::Manager::instance().register_window (&audio_port_matrix);
diff --git a/gtk2_ardour/mixer_snapshot_dialog.cc b/gtk2_ardour/mixer_snapshot_dialog.cc
index 8d6bd175d7..8ccc3d0c1a 100644
--- a/gtk2_ardour/mixer_snapshot_dialog.cc
+++ b/gtk2_ardour/mixer_snapshot_dialog.cc
@@ -44,7 +44,6 @@ struct ColumnInfo {
 MixerSnapshotDialog::MixerSnapshotDialog(Session* s)
     : ArdourDialog(_("Mixer Snapshot Manager:"), true, false)
 {
-    set_session(s);
     global_model = Gtk::ListStore::create(_columns);
     local_model  = Gtk::ListStore::create(_columns);
     
@@ -53,6 +52,8 @@ MixerSnapshotDialog::MixerSnapshotDialog(Session* s)
 
     global_display.signal_button_press_event().connect(sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::button_press), true), false);
     local_display.signal_button_press_event().connect(sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::button_press), false), false);
+    
+    set_session(s);
 }
 
 void MixerSnapshotDialog::set_session(Session* s)