diff --git a/src/AtomUI.Controls/Calendar/BaseCalendarDayButtonTheme.cs b/src/AtomUI.Controls/Calendar/BaseCalendarDayButtonTheme.cs
index d354d39fd..3ec3794c8 100644
--- a/src/AtomUI.Controls/Calendar/BaseCalendarDayButtonTheme.cs
+++ b/src/AtomUI.Controls/Calendar/BaseCalendarDayButtonTheme.cs
@@ -45,7 +45,7 @@ internal class BaseCalendarDayButtonTheme : BaseControlTheme
             contentPresenter.Content = buttonLabel;
             BindUtils.RelayBind(calendarDayButton, BaseCalendarDayButton.ContentProperty, buttonLabel, TextBlock.TextProperty,
                 input => input?.ToString());
-            BindUtils.RelayBind(calendarDayButton, BaseCalendarDayButton.ForegroundProperty, buttonLabel, TextBlock.ForegroundProperty);
+            BindUtils.RelayBind(contentPresenter, ContentPresenter.ForegroundProperty, buttonLabel, TextBlock.ForegroundProperty);
 
             CreateTemplateParentBinding(contentPresenter, ContentPresenter.PaddingProperty,
                 TemplatedControl.PaddingProperty);
diff --git a/src/AtomUI.Controls/DatePicker/CalendarView/CalendarDayButtonTheme.cs b/src/AtomUI.Controls/DatePicker/CalendarView/CalendarDayButtonTheme.cs
index 643263a18..1047111ca 100644
--- a/src/AtomUI.Controls/DatePicker/CalendarView/CalendarDayButtonTheme.cs
+++ b/src/AtomUI.Controls/DatePicker/CalendarView/CalendarDayButtonTheme.cs
@@ -35,16 +35,16 @@ internal class CalendarDayButtonTheme : BaseControlTheme
                 VerticalContentAlignment = VerticalAlignment.Center,
             };
             
-            var buttonLabel = new TextBlock()
+            var buttonLabel = new TextBlock
             {
                 HorizontalAlignment = HorizontalAlignment.Center,
                 VerticalAlignment = VerticalAlignment.Center,
             };
             
             contentPresenter.Content = buttonLabel;
-            BindUtils.RelayBind(calendarDayButton, BaseCalendarDayButton.ContentProperty, buttonLabel, TextBlock.TextProperty,
+            BindUtils.RelayBind(calendarDayButton, CalendarDayButton.ContentProperty, buttonLabel, TextBlock.TextProperty,
                 input => input?.ToString());
-            BindUtils.RelayBind(calendarDayButton, BaseCalendarDayButton.ForegroundProperty, buttonLabel, TextBlock.ForegroundProperty);
+            BindUtils.RelayBind(contentPresenter, ContentPresenter.ForegroundProperty, buttonLabel, TextBlock.ForegroundProperty);
             
             CreateTemplateParentBinding(contentPresenter, ContentPresenter.PaddingProperty,
                 TemplatedControl.PaddingProperty);
diff --git a/src/AtomUI.Controls/Flyouts/FlyoutStateHelper.cs b/src/AtomUI.Controls/Flyouts/FlyoutStateHelper.cs
index c220b46e2..9e36ed1d1 100644
--- a/src/AtomUI.Controls/Flyouts/FlyoutStateHelper.cs
+++ b/src/AtomUI.Controls/Flyouts/FlyoutStateHelper.cs
@@ -284,7 +284,7 @@ internal class FlyoutStateHelper : AvaloniaObject
                     return;
                 }
 
-                if (!Flyout.IsOpen)
+                if (!Flyout.IsOpen && TopLevel.GetTopLevel(AnchorTarget) == args.Root)
                 {
                     if (OpenFlyoutPredicate is not null)
                     {
diff --git a/src/AtomUI.Controls/TextBlock.cs b/src/AtomUI.Controls/TextBlock.cs
index 0d157f421..7a5ccdb75 100644
--- a/src/AtomUI.Controls/TextBlock.cs
+++ b/src/AtomUI.Controls/TextBlock.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Layout;
 using Avalonia.Media;