diff --git a/Needlework.Net/Views/ConsoleView.axaml.cs b/Needlework.Net/Views/ConsoleView.axaml.cs
index 6aacf54..9aa5cae 100644
--- a/Needlework.Net/Views/ConsoleView.axaml.cs
+++ b/Needlework.Net/Views/ConsoleView.axaml.cs
@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 using Avalonia.Styling;
 using AvaloniaEdit;
 using CommunityToolkit.Mvvm.Messaging;
@@ -31,9 +30,9 @@ public partial class ConsoleView : UserControl, IRecipient<ResponseUpdatedMessag
         message.Reply(_requestEditor!.Text);
     }
 
-    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
-        base.OnApplyTemplate(e);
+        base.OnAttachedToVisualTree(e);
 
         _responseEditor = this.FindControl<TextEditor>("ResponseEditor");
         _requestEditor = this.FindControl<TextEditor>("RequestEditor");
diff --git a/Needlework.Net/Views/EndpointView.axaml.cs b/Needlework.Net/Views/EndpointView.axaml.cs
index f436c95..3708d3b 100644
--- a/Needlework.Net/Views/EndpointView.axaml.cs
+++ b/Needlework.Net/Views/EndpointView.axaml.cs
@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 using Avalonia.Styling;
 using AvaloniaEdit;
 using CommunityToolkit.Mvvm.Messaging;
@@ -21,9 +20,9 @@ public partial class EndpointView : UserControl, IRecipient<EditorUpdateMessage>
         InitializeComponent();
     }
 
-    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
-        base.OnApplyTemplate(e);
+        base.OnAttachedToVisualTree(e);
 
         var vm = (EndpointViewModel)DataContext!;
         _requestEditor = this.FindControl<TextEditor>("EndpointRequestEditor");