diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 26c954d4966..cea9829858b 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,8 +1,8 @@
-2004-06-07 Alain Magloire
-
-	Fix PR 64328
-	* src/org/eclipse/cdt/internal/ui/poreferences/PreferencesMessages.properties
-
+2004-06-07 Bogdan Gheorghe
+	Fix for Bug 60772
+	
+	* src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java
+	
 2004-06-06 Bogdan Gheorghe
 	Changed MouseClickListener to use Parser KeywordSets 
 	* src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java
index b5170b674e1..c8dc6ba4ced 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java
@@ -54,6 +54,10 @@ public abstract class FindAction extends SelectionParseAction {
 	 protected CSearchQuery createSearchQuery(String pattern, SearchFor searchFor) {
 	 	CSearchQuery op = null;
 		ICSearchScope scope = getScope();
+		
+		if (scope == null)
+			return null;
+		
 		String scopeDescription = getScopeDescription();
 	
 		//Create a case sensitive search operation - limited by the node
@@ -159,6 +163,10 @@ public abstract class FindAction extends SelectionParseAction {
 		}
 	
 		CSearchQuery job = createSearchQuery(node);
+		
+		if (job == null)
+			return; 
+		
 		NewSearchUI.activateSearchResultView();
 		
 		NewSearchUI.runQuery(job);