diff --git a/src/PowerShellEditorServices.VSCode/CustomViews/CustomViewFeature.cs b/src/PowerShellEditorServices.VSCode/CustomViews/CustomViewFeature.cs
index 7e8f2cb50..ac65d02fa 100644
--- a/src/PowerShellEditorServices.VSCode/CustomViews/CustomViewFeature.cs
+++ b/src/PowerShellEditorServices.VSCode/CustomViews/CustomViewFeature.cs
@@ -16,20 +16,20 @@ internal abstract class CustomViewFeatureBase<TView>
     {
         protected IMessageSender messageSender;
         protected ILogger logger;
-        private Dictionary<string, TView> viewIndex;
+        private readonly Dictionary<Guid, TView> viewIndex;
 
         public CustomViewFeatureBase(
             IMessageSender messageSender,
             ILogger logger)
         {
-            this.viewIndex = new Dictionary<string, TView>();
+            this.viewIndex = new Dictionary<Guid, TView>();
             this.messageSender = messageSender;
             this.logger = logger;
         }
 
         protected void AddView(TView view)
         {
-            this.viewIndex.Add(view.Title, view);
+            this.viewIndex.Add(view.Id, view);
         }
     }
 }