1 files changed, 11 insertions, 6 deletions
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
index 9c131267022..5c6374d898f 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
@@ -266,12 +266,17 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
 
 	public IEditorPart getActiveEditor() {
 		IWorkbenchPage activePage= fWorkbenchWindow.getActivePage();
-		if (activePage != null) {
-			IEditorPart activeEditor= activePage.getActiveEditor();
-			IWorkbenchPart activePart= activePage.getActivePart();
-			if (activeEditor == activePart || isOldSearchView(activePart))
-				return activeEditor;
-		}
+		if (activePage == null)
+			return null;
+
+		IWorkbenchPart activePart= activePage.getActivePart();
+		if (activePart == null)
+			return null;
+
+		IEditorPart activeEditor= activePage.getActiveEditor();
+		if (activeEditor == activePart || isOldSearchView(activePart))
+			return activeEditor;
+
 		return null;
 	}