diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/AbstractSettingsDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/AbstractSettingsDialog.java
index 501944899b..a7102eea02 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/AbstractSettingsDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/AbstractSettingsDialog.java
@@ -70,7 +70,8 @@ public abstract class AbstractSettingsDialog extends DialogComponentProvider {
 		this.settingsDefinitions = settingDefinitions;
 		settings = new SettingsImpl(originalSettings) {
 			public boolean isChangeAllowed(SettingsDefinition settingsDefinition) {
-				return originalSettings.isChangeAllowed(settingsDefinition);
+				return originalSettings == null ||
+					originalSettings.isChangeAllowed(settingsDefinition);
 			}
 		};
 		defaultSettings = settings.getDefaultSettings();