diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/memory/AddBlockDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/memory/AddBlockDialog.java
index 764466b80b..78aba20b5b 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/memory/AddBlockDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/memory/AddBlockDialog.java
@@ -544,8 +544,7 @@ class AddBlockDialog extends DialogComponentProvider implements ChangeListener {
 		addrField = new AddressInput();
 		addrField.setName("Start Addr");
 		addrFactory = model.getProgram().getAddressFactory();
-		addrField.setAddressFactory(addrFactory,
-			AddressInput.INCLUDE_OTHER_AND_LOADED_MEMORY_SPACES);
+		addrField.setAddressFactory(addrFactory, AddressInput.INCLUDE_ALL_MEMORY_SPACES);
 		addrField.addChangeListener(ev -> addrChanged());
 		return addrField;
 	}
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/AddressInput.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/AddressInput.java
index aa61dab27a..75c8e934a6 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/AddressInput.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/AddressInput.java
@@ -183,12 +183,12 @@ public class AddressInput extends JPanel implements FocusableEditor {
 	};
 
 	/**
-	 * Address Space predicate which include all loaded memory spaces plus the 
-	 * {@link AddressSpace#OTHER_SPACE}.  See {@link AddressSpace#isLoadedMemorySpace()}.
+	 * Address Space predicate which includes all memory spaces, including the 
+	 * {@link AddressSpace#OTHER_SPACE} and all overlay spaces. 
 	 * Intended for use with {@link #setAddressFactory(AddressFactory, Predicate)}.
 	 */
-	public final static Predicate<AddressSpace> INCLUDE_OTHER_AND_LOADED_MEMORY_SPACES = (s) -> {
-		return s.isLoadedMemorySpace() || s.equals(AddressSpace.OTHER_SPACE);
+	public final static Predicate<AddressSpace> INCLUDE_ALL_MEMORY_SPACES = (s) -> {
+		return s.isMemorySpace();
 	};
 
 	/**