diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs
index 9ecec723a6..4965ea5cad 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs
@@ -184,8 +184,11 @@ namespace ICSharpCode.SharpDevelop.Project
 		{			
 			LoggingService.DebugFormatted("Selecting Deepest for '{0}'", fileName);
 			Solution solution = ProjectService.OpenSolution;
+			if (solution == null) {
+				return;
+			}
 
-			IProject project = ProjectService.OpenSolution.FindProjectContainingFile(fileName);
+			IProject project = solution.FindProjectContainingFile(fileName);
 			if (project == null) {
 				LoggingService.Debug("no IProject found");
 				return;