diff --git a/gui/graphFrame/panel.py b/gui/graphFrame/panel.py
index 8c1067928..dee3d87b3 100644
--- a/gui/graphFrame/panel.py
+++ b/gui/graphFrame/panel.py
@@ -129,6 +129,8 @@ class GraphControlPanel(wx.Panel):
         self._setVectorDefaults()
 
     def updateControls(self, layout=True):
+        if layout:
+            self.Freeze()
         self._clearStoredValues()
         view = self.graphFrame.getView()
         self.ySubSelection.Clear()
@@ -173,6 +175,7 @@ class GraphControlPanel(wx.Panel):
         if layout:
             self.graphFrame.Layout()
             self.graphFrame.UpdateWindowSize()
+            self.Thaw()
 
     def _updateInputs(self, storeInputs=True):
         if storeInputs: