diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSiteDragAndDropServiceImpl.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSiteDragAndDropServiceImpl.java
index 1fc83a9..a3b692e 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSiteDragAndDropServiceImpl.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSiteDragAndDropServiceImpl.java
@@ -128,7 +128,8 @@
 		}
 
 		private DropTargetListener getAppropriateListener(DropTargetEvent event, boolean checkOperation) {
-			if (isSupportedType(primaryTransfers, event.currentDataType)) {
+			if (event.currentDataType == null
+					|| isSupportedType(primaryTransfers, event.currentDataType)) {
 				if (checkOperation && !isSupportedOperation(primaryOps, event.detail)) {
 					event.detail = DND.DROP_NONE;
 				}