diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java index 4404ef69989..bcac7d50a32 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java @@ -964,7 +964,18 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP if (activePage == null) { IWorkbenchWindow activeWindow = wb.getActiveWorkbenchWindow(); - activePage = activeWindow.getActivePage(); + if (activeWindow == null) + { + activePage = activeWindow.getActivePage(); + } + else + { + IWorkbenchWindow[] windows = wb.getWorkbenchWindows(); + if (windows != null && windows.length > 0) + { + activePage = windows[0].getActivePage(); + } + } } IEditorReference[] activeReferences = activePage.getEditorReferences();