diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/StorageTableCellEditor.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/StorageTableCellEditor.java
index ca6283b2bb..66449ad8d3 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/StorageTableCellEditor.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/StorageTableCellEditor.java
@@ -52,6 +52,8 @@ class StorageTableCellEditor extends AbstractCellEditor implements TableCellEdit
 	@Override
 	public Component getTableCellEditorComponent(final JTable table, Object value,
 			boolean isSelected, int row, int column) {
+
+		storage = null;
 		String stringValue = value == null ? "" : value.toString();
 		JTextField field = new JTextField(stringValue);
 		field.setBackground(getUneditableForegroundColor(isSelected));