diff --git a/demo/Ursa.Demo/Pages/DisableContainerDemo.axaml b/demo/Ursa.Demo/Pages/DisableContainerDemo.axaml
index 80f5848..c355b01 100644
--- a/demo/Ursa.Demo/Pages/DisableContainerDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DisableContainerDemo.axaml
@@ -1,20 +1,29 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:u="https://irihi.tech/ursa"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ursa.Demo.Pages.DisableContainerDemo">
+<UserControl
+    x:Class="Ursa.Demo.Pages.DisableContainerDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:u="https://irihi.tech/ursa"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <ToggleSwitch Name="s" IsChecked="True"></ToggleSwitch>
+        <ToggleSwitch Name="s" IsChecked="True" />
         <u:DisableContainer DisabledTip="This is disabled. ">
             <Button IsEnabled="{Binding #s.IsChecked}">Hello World!</Button>
         </u:DisableContainer>
         <u:DisableContainer DisabledTip="This is disabled. ">
-            <Calendar IsEnabled="{Binding #s.IsChecked}"></Calendar>
+            <Calendar IsEnabled="{Binding #s.IsChecked}" />
         </u:DisableContainer>
         <u:DisableContainer>
-            <Calendar IsEnabled="{Binding #s.IsChecked}"></Calendar>
+            <Button IsEnabled="{Binding #s.IsChecked}">Hello Avalonnia</Button>
         </u:DisableContainer>
+        <Button
+            u:DisabledAdorner.DisabledTip="Fine"
+            u:DisabledAdorner.IsEnabled="True"
+            IsEnabled="{Binding #s.IsChecked}">
+            Hello Avalonia
+        </Button>
     </StackPanel>
 </UserControl>
diff --git a/src/Ursa/Controls/DisableContainer.cs b/src/Ursa/Controls/DisableContainer/DisableContainer.cs
similarity index 100%
rename from src/Ursa/Controls/DisableContainer.cs
rename to src/Ursa/Controls/DisableContainer/DisableContainer.cs
diff --git a/src/Ursa/Controls/DisableContainer/DisabledAdorner.cs b/src/Ursa/Controls/DisableContainer/DisabledAdorner.cs
new file mode 100644
index 0000000..3699b3a
--- /dev/null
+++ b/src/Ursa/Controls/DisableContainer/DisabledAdorner.cs
@@ -0,0 +1,55 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+using Avalonia.Input;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Ursa.Controls.Shapes;
+
+namespace Ursa.Controls;
+
+public class DisabledAdorner
+{
+    public static readonly AttachedProperty<bool> IsEnabledProperty =
+        AvaloniaProperty.RegisterAttached<DisabledAdorner, InputElement, bool>("IsEnabled");
+
+    public static void SetIsEnabled(InputElement obj, bool value) => obj.SetValue(IsEnabledProperty, value);
+    public static bool GetIsEnabled(InputElement obj) => obj.GetValue(IsEnabledProperty);
+
+    public static readonly AttachedProperty<object?> DisabledTipProperty =
+        AvaloniaProperty.RegisterAttached<DisabledAdorner, InputElement, object?>("DisabledTip");
+
+    public static void SetDisabledTip(InputElement obj, object? value) => obj.SetValue(DisabledTipProperty, value);
+    public static object? GetDisabledTip(InputElement obj) => obj.GetValue(DisabledTipProperty);
+
+    static DisabledAdorner()
+    {
+        IsEnabledProperty.Changed.AddClassHandler<InputElement, bool>(OnIsEnabledChanged);
+    }
+
+    private static void OnIsEnabledChanged(InputElement arg1, AvaloniaPropertyChangedEventArgs<bool> arg2)
+    {
+        if (arg2.NewValue.Value)
+        {
+            var pureRectangle = new Border()
+            {
+                Background = Brushes.Transparent,
+                IsHitTestVisible = true,
+                HorizontalAlignment = HorizontalAlignment.Stretch,
+                VerticalAlignment = VerticalAlignment.Stretch,
+                Cursor = new Cursor(StandardCursorType.No),
+                [!ToolTip.TipProperty] = arg1[!DisabledTipProperty],
+            };
+            var binding = arg1.GetObservable(InputElement.IsEnabledProperty, converter: (a) => !a).ToBinding();
+            pureRectangle.Bind(Visual.IsVisibleProperty, binding);
+            AdornerLayer.SetAdorner(arg1, pureRectangle);
+        }
+        else
+        {
+            AdornerLayer.SetAdorner(arg1, null);
+        }
+
+    }
+}
\ No newline at end of file