diff --git a/src/main/java/com/romraider/maps/DataCellView.java b/src/main/java/com/romraider/maps/DataCellView.java
index a9e57b82..2a47d402 100644
--- a/src/main/java/com/romraider/maps/DataCellView.java
+++ b/src/main/java/com/romraider/maps/DataCellView.java
@@ -104,17 +104,13 @@ public class DataCellView extends JLabel implements MouseListener, Serializable
         return SettingsManager.getSettings();
     }
     
-    public void updatePresetPanel() {
-        tableView.updatePresetPanel();
-    }
-    
     public void drawCell() {
         if(tableView == null || tableView.isHidden()) {
             // Table will be null in the static case.
             return;
         }
 
-        updatePresetPanel();
+        tableView.updatePresetPanel();
         this.invalidate();
         setFont(getSettings().getTableFont());
         setText(getCellText());
diff --git a/src/main/java/com/romraider/maps/PresetPanel.java b/src/main/java/com/romraider/maps/PresetPanel.java
index 73a8877c..4257dce1 100644
--- a/src/main/java/com/romraider/maps/PresetPanel.java
+++ b/src/main/java/com/romraider/maps/PresetPanel.java
@@ -171,7 +171,10 @@ public class PresetPanel extends JPanel {
 			}
 			
 			//Make sure we update all other checkboxes
-			view.updatePresetPanel();
+			//DataCellView usually calls this, but we dont have any DataCell 
+			//if we are hidden
+			if(view.isHidden())
+				view.updatePresetPanel();
 		}	
 	}
 }