diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypeManagerPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypeManagerPlugin.java
index 6d85fec672..319090e7c8 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypeManagerPlugin.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypeManagerPlugin.java
@@ -175,7 +175,7 @@ public class DataTypeManagerPlugin extends ProgramPlugin
 
 	@Override
 	public void serviceAdded(Class<?> interfaceClass, Object service) {
-		if (interfaceClass == CodeViewerService.class) {
+		if (CodeViewerService.class.isAssignableFrom(interfaceClass)) {
 			CodeViewerService codeViewerService = (CodeViewerService) service;
 			codeViewerService.addProgramDropProvider(new DataDropOnBrowserHandler(this));
 		}