diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/BitFieldEditorPanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/BitFieldEditorPanel.java
index 0bdf2535a9..69c014d2ee 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/BitFieldEditorPanel.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/BitFieldEditorPanel.java
@@ -751,7 +751,7 @@ public class BitFieldEditorPanel extends JPanel {
 	}
 
 	ActionContext getActionContext(MouseEvent event) {
-		if (placementComponent == event.getSource()) {
+		if (event != null && placementComponent == event.getSource()) {
 			Point p = event.getPoint();
 			return new BitFieldEditorContext(getDataTypeComponent(p),
 				placementComponent.getBitOffset(p));