diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerCodeComparisonPanel.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerCodeComparisonPanel.java
index 940214d382..1e1046f34a 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerCodeComparisonPanel.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerCodeComparisonPanel.java
@@ -440,7 +440,10 @@ public abstract class DecompilerCodeComparisonPanel<T extends DualDecompilerFiel
 		}
 
 		// Kick the tool so action buttons will be updated
-		tool.getActiveComponentProvider().contextChanged();
+		ComponentProvider provider = tool.getWindowManager().getProvider(comp);
+		if (provider != null) {
+			provider.contextChanged();
+		}
 	}
 
 	private void setDualPanelFocus(int leftOrRight) {