diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 3b92baa42a..37e7b7beac 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -812,14 +812,14 @@ namespace Avalonia.Controls
         {
             base.OnAttachedToVisualTree(e);
 
-            if (IsFocused)
+            if (_presenter != null)
             {
-                if(_presenter != null)
+                if (IsFocused)
                 {
                     _presenter.ShowCaret();
-
-                    _presenter.PropertyChanged += PresenterPropertyChanged;
                 }
+
+                _presenter.PropertyChanged += PresenterPropertyChanged;
             }
         }