diff --git a/src/AtomUI.Controls/DatePicker/CalendarView/CalendarDayButton.cs b/src/AtomUI.Controls/DatePicker/CalendarView/CalendarDayButton.cs
index 3a90b2fd7..76856a76b 100644
--- a/src/AtomUI.Controls/DatePicker/CalendarView/CalendarDayButton.cs
+++ b/src/AtomUI.Controls/DatePicker/CalendarView/CalendarDayButton.cs
@@ -315,12 +315,9 @@ internal sealed class CalendarDayButton : AvaloniaButton,
     protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
-        if (this.IsAttachedToVisualTree())
+        if (change.Property == IsMotionEnabledProperty)
         {
-            if (change.Property == IsMotionEnabledProperty)
-            {
-                ConfigureTransitions();
-            }
+            ConfigureTransitions();
         }
     }
 }
\ No newline at end of file
diff --git a/src/AtomUI.Controls/Utils/Converters/StringToTextBlockConverter.cs b/src/AtomUI.Controls/Utils/Converters/StringToTextBlockConverter.cs
index b1b091501..52f3ae23b 100644
--- a/src/AtomUI.Controls/Utils/Converters/StringToTextBlockConverter.cs
+++ b/src/AtomUI.Controls/Utils/Converters/StringToTextBlockConverter.cs
@@ -26,6 +26,7 @@ internal class StringToTextBlockConverter : IValueConverter
                 HorizontalAlignment = HorizontalAlignment,
                 Height = Height,
                 Width = Width,
+                TextWrapping = TextWrapping,
                 LineHeight = LineHeight,
             };
         }