diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorDialog.java
index 568d284977..128f59efd0 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorDialog.java
@@ -681,6 +681,9 @@ public class FunctionEditorDialog extends DialogComponentProvider implements Mod
 			public void focusLost(FocusEvent e) {
 				Component component = e.getComponent();
 				Component opposite = e.getOppositeComponent();
+				if (opposite == null) {
+					return; // this implies a non-Java app has taken focus
+				}
 				if (!SwingUtilities.isDescendingFrom(opposite, component)) {
 					component.removeFocusListener(this);
 					if (cellEditor != null) {