diff --git a/Ghidra/Framework/Docking/src/main/java/docking/ActionContext.java b/Ghidra/Framework/Docking/src/main/java/docking/ActionContext.java
index bef6edff42..b55469f346 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/ActionContext.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/ActionContext.java
@@ -228,8 +228,10 @@ public class ActionContext {
 	 * @return this context
 	 */
 	public ActionContext setMouseEvent(MouseEvent e) {
-		this.mouseEvent = e;
-		this.eventClickModifiers = e.getModifiersEx();
+		if (e != null) {
+			this.mouseEvent = e;
+			this.eventClickModifiers = e.getModifiersEx();
+		}
 		return this;
 	}