diff --git a/src/Main/Base/Project/Src/Project/Behaviors/DefaultProjectBehavior.cs b/src/Main/Base/Project/Src/Project/Behaviors/DefaultProjectBehavior.cs
index afb2299626..1100b001fb 100644
--- a/src/Main/Base/Project/Src/Project/Behaviors/DefaultProjectBehavior.cs
+++ b/src/Main/Base/Project/Src/Project/Behaviors/DefaultProjectBehavior.cs
@@ -81,15 +81,14 @@ namespace ICSharpCode.SharpDevelop.Project
 			SD.MainThread.VerifyAccess();
 			
 			// breakpoints and files
-			Properties properties = new Properties();
-			properties.SetList("bookmarks", SD.BookmarkManager.GetProjectBookmarks(Project));
+			preferences.SetList("bookmarks", SD.BookmarkManager.GetProjectBookmarks(Project));
 			List<string> files = new List<string>();
 			foreach (var fileName in FileService.GetOpenFiles()) {
 				if (fileName != null && Project.IsFileInProject(fileName)) {
 					files.Add(fileName);
 				}
 			}
-			properties.SetList("openFiles", files);
+			preferences.SetList("openFiles", files);
 		}
 		
 		public override void ProjectLoaded()
@@ -101,7 +100,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				SD.BookmarkManager.AddMark(mark);
 			}
 			List<string> filesToOpen = new List<string>();
-			foreach (string fileName in memento.GetList<string>("files")) {
+			foreach (string fileName in memento.GetList<string>("openFiles")) {
 				if (File.Exists(fileName)) {
 					filesToOpen.Add(fileName);
 				}
diff --git a/src/Main/SharpDevelop/Editor/Bookmarks/BookmarkManager.cs b/src/Main/SharpDevelop/Editor/Bookmarks/BookmarkManager.cs
index 8ae1736e18..2c6bbd8527 100644
--- a/src/Main/SharpDevelop/Editor/Bookmarks/BookmarkManager.cs
+++ b/src/Main/SharpDevelop/Editor/Bookmarks/BookmarkManager.cs
@@ -19,7 +19,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Bookmarks
 	{
 		public BookmarkManager()
 		{
-			Project.ProjectService.SolutionClosing += delegate { Clear(); };
+			Project.ProjectService.SolutionClosed += delegate { Clear(); };
 		}
 		
 		List<SDBookmark> bookmarks = new List<SDBookmark>();