diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/threaded/TableData.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/threaded/TableData.java
index 0d4668f6b3..0ff84a193c 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/threaded/TableData.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/threaded/TableData.java
@@ -139,7 +139,7 @@ public class TableData<ROW_OBJECT> implements Iterable<ROW_OBJECT> {
 	 * @return the index
 	 */
 	public int indexOf(ROW_OBJECT t) {
-		if (!sortContext.isUnsorted()) {
+		if (isSorted()) {
 			Comparator<ROW_OBJECT> comparator = sortContext.getComparator();
 			return Collections.binarySearch(data, t, comparator);
 		}
@@ -159,7 +159,7 @@ public class TableData<ROW_OBJECT> implements Iterable<ROW_OBJECT> {
 			source.remove(t);
 		}
 
-		if (sortContext.isUnsorted()) {
+		if (!isSorted()) {
 			return data.remove(t); // no sort; cannot binary search
 		}