diff --git a/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs b/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
index 765434ac6f..f8f4b93156 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
@@ -217,7 +217,12 @@ namespace ICSharpCode.Core
 					}
 				}
 			}
-			document.BookmarkManager.AddMark(new BreakpointBookmark(fileName, document, lineNumber));
+			foreach (char ch in document.GetText(document.GetLineSegment(lineNumber))) {
+				if (!char.IsWhiteSpace(ch)) {
+					document.BookmarkManager.AddMark(new BreakpointBookmark(fileName, document, lineNumber));
+					break;
+				}
+			}
 		}
 		
 		static void WorkspaceCreated(object sender, EventArgs args)
diff --git a/src/Main/Base/Project/Src/Services/File/FileService.cs b/src/Main/Base/Project/Src/Services/File/FileService.cs
index f5c99ce664..0305774daf 100644
--- a/src/Main/Base/Project/Src/Services/File/FileService.cs
+++ b/src/Main/Base/Project/Src/Services/File/FileService.cs
@@ -83,6 +83,7 @@ namespace ICSharpCode.Core
 		
 		public static IWorkbenchWindow OpenFile(string fileName)
 		{
+			LoggingService.Info("Open file " + fileName);
 			// test, if file fileName exists
 			bool isURL = fileName.IndexOf("://") > 0;
 			if (!isURL) {