From cda32a83b405c6994bbfaeb2f49ed3333b5394f7 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <b.stebner@outlook.de>
Date: Mon, 31 Jan 2022 20:11:31 +0100
Subject: [PATCH] Keep _presenter reference

---
 src/Avalonia.Controls/TextBox.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index ee7346b747..c8955f2e1c 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -540,6 +540,11 @@ namespace Avalonia.Controls
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             _presenter = e.NameScope.Get<TextPresenter>("PART_TextPresenter");
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
             
             _imClient.SetPresenter(_presenter, this);
             
@@ -554,8 +559,6 @@ namespace Avalonia.Controls
             base.OnDetachedFromVisualTree(e);
             
             _imClient.SetPresenter(null, null);
-
-            _presenter = null;
         }
 
         protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)