diff --git a/ILSpy/Docking/DockWorkspace.cs b/ILSpy/Docking/DockWorkspace.cs
index ed962650b..f62761301 100644
--- a/ILSpy/Docking/DockWorkspace.cs
+++ b/ILSpy/Docking/DockWorkspace.cs
@@ -93,6 +93,9 @@ namespace ICSharpCode.ILSpy.Docking
 					if (value is DecompiledDocumentModel ddm) {
 						this.sessionSettings.FilterSettings.Language = ddm.Language;
 						this.sessionSettings.FilterSettings.LanguageVersion = ddm.LanguageVersion;
+						if (ddm.TextView is DecompilerTextView view) {
+							MainWindow.Instance.SelectNodes(view.GetState().DecompiledNodes);
+						}
 					}
 					RaisePropertyChanged(nameof(ActiveDocument));
 				}
diff --git a/ILSpy/MainWindow.xaml.cs b/ILSpy/MainWindow.xaml.cs
index 67b278b89..418ec68e8 100644
--- a/ILSpy/MainWindow.xaml.cs
+++ b/ILSpy/MainWindow.xaml.cs
@@ -119,9 +119,6 @@ namespace ICSharpCode.ILSpy
 			DockWorkspace.Instance.LoadSettings(sessionSettings);
 			InitializeComponent();
 			DockWorkspace.Instance.InitializeLayout(DockManager);
-			DockWorkspace.Instance.PropertyChanged += filter_DockWorkspace_PropertyChanged;
-
-
 			sessionSettings.FilterSettings.PropertyChanged += filterSettings_PropertyChanged;
 
 			InitMainMenu();
@@ -131,17 +128,6 @@ namespace ICSharpCode.ILSpy
 			this.Loaded += MainWindow_Loaded;
 		}
 
-		private void filter_DockWorkspace_PropertyChanged(object sender, PropertyChangedEventArgs e)
-		{
-			if (e.PropertyName == "ActiveDocument") {
-				if ((sender as DockWorkspace).ActiveDocument is DecompiledDocumentModel doc) {
-					var view = doc.TextView;
-					if (view != null)
-						MainWindow.Instance.SelectNodes(view.GetState().DecompiledNodes);
-				}
-			}
-		}
-
 		void SetWindowBounds(Rect bounds)
 		{
 			this.Left = bounds.Left;