diff --git a/Debugger/ILSpy.Debugger/AvalonEdit/IconBarMargin.cs b/Debugger/ILSpy.Debugger/AvalonEdit/IconBarMargin.cs
index ba0419317..fff248991 100644
--- a/Debugger/ILSpy.Debugger/AvalonEdit/IconBarMargin.cs
+++ b/Debugger/ILSpy.Debugger/AvalonEdit/IconBarMargin.cs
@@ -231,7 +231,7 @@ namespace ILSpy.Debugger.AvalonEdit
 				BookmarkBase bm = GetBookmarkFromLine(line);
 				if (bm != null) {
 					bm.MouseUp(e);
-					if (CurrentType != null) {
+					if (bm.CanToggle) {
 						BookmarkManager.RemoveMark(bm);
 					}
 					InvalidateVisual();
diff --git a/ILSpy/MainWindow.xaml.cs b/ILSpy/MainWindow.xaml.cs
index 4dc675245..2d3347a7e 100644
--- a/ILSpy/MainWindow.xaml.cs
+++ b/ILSpy/MainWindow.xaml.cs
@@ -537,7 +537,7 @@ namespace ICSharpCode.ILSpy
 		void LanguageComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
 		{
 			DebuggerService.CurrentDebugger.Language = 
-				sessionSettings.FilterSettings.Language.Name == "IL" ? DecompiledLanguages.IL : DecompiledLanguages.CSharp;
+				sessionSettings.FilterSettings.Language.Name.StartsWith("IL") ? DecompiledLanguages.IL : DecompiledLanguages.CSharp;
 		}
 	}
 }
\ No newline at end of file