diff --git a/system/plots.py b/system/plots.py
index 18ffb22..f614626 100644
--- a/system/plots.py
+++ b/system/plots.py
@@ -292,6 +292,8 @@ class Plot (View):
     def set_frozen(self, frozen):
         """A frozen plot will not be updated when the current selection is changed."""
         self._frozen = frozen
+        if not frozen:
+            self.set_current_selection(self._current_selection)
     
     def get_title(self):
         return self.title
@@ -312,6 +314,8 @@ class Plot (View):
                or not self.get_property('visible') \
                or self.current_dim != dim_name:
             return
+        else:
+            self._current_selection = selection
         
         self.set_current_selection(selection)