diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptComponentProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptComponentProvider.java
index d8168ea452..4d8c299056 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptComponentProvider.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptComponentProvider.java
@@ -549,8 +549,12 @@ public class GhidraScriptComponentProvider extends ComponentProviderAdapter {
 				return;
 			}
 
+			// Create user script directory if it doesn't exist
+			File userScriptsDir = new File(GhidraScriptUtil.USER_SCRIPTS_DIR);
+			FileUtilities.checkedMkdirs(userScriptsDir);
+
 			ResourceFile newFile = GhidraScriptUtil.createNewScript(provider,
-				new ResourceFile(GhidraScriptUtil.USER_SCRIPTS_DIR), getScriptDirectories());
+				new ResourceFile(userScriptsDir), getScriptDirectories());
 			SaveDialog dialog = new SaveNewScriptDialog(getComponent(), "New Script", this, newFile,
 				actionManager.getNewHelpLocation());
 			if (dialog.isCancelled()) {