1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java
index 059ba0407107..e4b7fccedbff 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java
@@ -281,7 +281,8 @@ public final class PropertyInspectorTable extends Table implements DataProvider{
       return myEditor;
     }
     else if (PlatformDataKeys.FILE_EDITOR.is(dataId)) {
-      return UIDesignerToolWindowManager.getInstance(myProject).getActiveFormFileEditor();
+      GuiEditor designer = DesignerToolWindowManager.getInstance(myProject).getActiveFormEditor();
+      return designer == null ? null : designer.getEditor();
     }
     else if (PlatformDataKeys.HELP_ID.is(dataId)) {
       return ourHelpID;