diff --git a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/AbstractGhidraHeadedDebuggerTest.java b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/AbstractGhidraHeadedDebuggerTest.java
index 18c2827ab3..38bb51f9ef 100644
--- a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/AbstractGhidraHeadedDebuggerTest.java
+++ b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/AbstractGhidraHeadedDebuggerTest.java
@@ -555,6 +555,9 @@ public abstract class AbstractGhidraHeadedDebuggerTest
 			if (provider == null) {
 				ctx = new DefaultActionContext();
 			}
+			else {
+				ctx = provider.getActionContext(null);
+			}
 
 			ctx.setContextProvider(provider);