diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/ViewStringsTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/ViewStringsTableModel.java
index 7de6e69c37..c8b739f854 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/ViewStringsTableModel.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/ViewStringsTableModel.java
@@ -132,6 +132,7 @@ class ViewStringsTableModel extends AddressBasedTableModel<ProgramLocation> {
 		ProgramLocation progLoc = rowsIndexedByAddress.get(addr);
 		if (progLoc != null) {
 			removeObject(progLoc);
+			rowsIndexedByAddress.remove(addr);
 		}
 	}