diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java
index 8ad0c87313..f74c604142 100644
--- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java
+++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java
@@ -456,6 +456,9 @@ public class ServerAdmin implements GhidraLaunchable {
 			Msg.error(CommandProcessor.class, "Repository not found: " + repName);
 			System.exit(-1);
 		}
+		if (repName.contains(" ")) {
+			args[i] = "\"" + repName + "\"";
+		}
 	}
 
 	/**