diff --git a/gtk2_ardour/mixer_snapshot_dialog.cc b/gtk2_ardour/mixer_snapshot_dialog.cc
index 8e38bcae00..e7c91bbae5 100644
--- a/gtk2_ardour/mixer_snapshot_dialog.cc
+++ b/gtk2_ardour/mixer_snapshot_dialog.cc
@@ -170,8 +170,7 @@ bool MixerSnapshotDialog::button_press(GdkEventButton* ev, bool global)
         }
 
         if (iter) {
-            TreeModel::Row row = *(iter);
-            popup_context_menu(ev->button, ev->time, row[_columns.full_path], global);
+            popup_context_menu(ev->button, ev->time, iter, global);
             return true;
         }
     };
@@ -189,39 +188,33 @@ bool MixerSnapshotDialog::button_press(GdkEventButton* ev, bool global)
         local_display.get_selection()->unselect_all();
 
         if(iter) {
-            MixerSnapshot* s = (*iter)[_columns.snapshot];
-            s->recall();
+            load_snapshot(iter);
             return true;
         }
     }
     return false;
 }
 
-void MixerSnapshotDialog::popup_context_menu(int btn, int64_t time, string path, bool global)
+void MixerSnapshotDialog::popup_context_menu(int btn, int64_t time, TreeModel::iterator& iter, bool global)
 {
     using namespace Menu_Helpers;
     MenuList& items(menu.items());
     items.clear();
-    add_item_with_sensitivity(items, MenuElem(_("Recall"), sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::load_snapshot), path)), true);
-    add_item_with_sensitivity(items, MenuElem(_("Rename..."), sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::rename_snapshot), path, global)), true);
-    add_item_with_sensitivity(items, MenuElem(_("Remove"), sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::remove_snapshot), path, global)), true);
+    add_item_with_sensitivity(items, MenuElem(_("Recall"), sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::load_snapshot), iter)), true);
+    add_item_with_sensitivity(items, MenuElem(_("Rename..."), sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::rename_snapshot), iter)), true);
+    add_item_with_sensitivity(items, MenuElem(_("Remove"), sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::remove_snapshot), iter, global)), true);
     menu.popup(btn, time);
 }
 
-void MixerSnapshotDialog::remove_snapshot(const string path, bool global)
+void MixerSnapshotDialog::load_snapshot(TreeModel::iterator& iter)
 {
-    ::g_remove(path.c_str());
-    refill_display(global);
+    MixerSnapshot* snap = (*iter)[_columns.snapshot];
+    snap->recall();
 }
 
-void MixerSnapshotDialog::load_snapshot(const string path)
-{
-    MixerSnapshot n = MixerSnapshot(_session, path);
-    n.recall();
-}
-
-void MixerSnapshotDialog::rename_snapshot(const string old_path, bool global)
+void MixerSnapshotDialog::rename_snapshot(TreeModel::iterator& iter)
 {
+    string old_path = (*iter)[_columns.full_path];
     string dir_name  = Glib::path_get_dirname(old_path);
 
     Prompter prompt(true);
@@ -237,11 +230,24 @@ void MixerSnapshotDialog::rename_snapshot(const string old_path, bool global)
         if (new_label.length() > 0) {
             string new_path = Glib::build_filename(dir_name, new_label + ".xml");
             ::g_rename(old_path.c_str(), new_path.c_str());
-            refill_display(global);
+            (*iter)[_columns.name] = new_label;
         }
     }
 }
 
+void MixerSnapshotDialog::remove_snapshot(TreeModel::iterator& iter, bool global)
+{
+    string path = (*iter)[_columns.full_path];
+    ::g_remove(path.c_str());
+
+    if(global) {
+        global_model->erase(iter);
+    } else {
+        local_model->erase(iter);
+    }
+}
+
+
 bool MixerSnapshotDialog::bootstrap_display_and_model(Gtkmm2ext::DnDTreeView<string>& display, Gtk::ScrolledWindow& scroller, Glib::RefPtr<ListStore> model, bool global)
 {
     if(!model) {
diff --git a/gtk2_ardour/mixer_snapshot_dialog.h b/gtk2_ardour/mixer_snapshot_dialog.h
index 3a1acda254..0aa6c0889d 100644
--- a/gtk2_ardour/mixer_snapshot_dialog.h
+++ b/gtk2_ardour/mixer_snapshot_dialog.h
@@ -53,15 +53,15 @@ class MixerSnapshotDialog : public ArdourWindow
 
         void ensure_directory(bool);
         void new_snapshot(bool);
-        void load_snapshot(const std::string);
+        void load_snapshot(Gtk::TreeModel::iterator&);
         void new_snap_from_session(bool);
 
-        void rename_snapshot(const std::string, bool);
-        void remove_snapshot(const std::string, bool);
+        void rename_snapshot(Gtk::TreeModel::iterator&);
+        void remove_snapshot(Gtk::TreeModel::iterator&, bool);
 
         bool bootstrap_display_and_model(Gtkmm2ext::DnDTreeView<std::string>&, Gtk::ScrolledWindow&, Glib::RefPtr<Gtk::ListStore>, bool);
 
-        void popup_context_menu(int, int64_t, std::string, bool);
+        void popup_context_menu(int, int64_t, Gtk::TreeModel::iterator&, bool);
         bool button_press(GdkEventButton*, bool);
         void window_opened();
         void fav_cell_action(const std::string&, bool);