diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 33ae22e..9f13f46 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -19,6 +19,7 @@
             <ControlTemplate TargetType="u:CustomDialogControl">
                 <Border
                     Name="PART_Border"
+                    Focusable="True"
                     Padding="0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
@@ -152,6 +153,7 @@
                 <Border
                     Name="PART_Border"
                     Padding="0"
+                    Focusable="True"
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalAlignment}"
                     BoxShadow="0 0 8 0 #1A000000"
diff --git a/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml b/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
index 3487f47..216f7a8 100644
--- a/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
+++ b/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
@@ -65,7 +65,9 @@
                                 Margin="{Binding $parent[u:UrsaWindow].TitleBarMargin}"
                                 LeftContent="{Binding $parent[u:UrsaWindow].LeftContent}"
                                 RightContent="{Binding $parent[u:UrsaWindow].RightContent}" />
-                            <u:OverlayDialogHost IsModalStatusReporter="True" />
+                            <VisualLayerManager>
+                                <u:OverlayDialogHost IsModalStatusReporter="True" />
+                            </VisualLayerManager>
                         </VisualLayerManager.ChromeOverlayLayer>
                         <Panel>
                             <ContentPresenter
diff --git a/src/Ursa/Controls/Dialog/OverlayDialog.cs b/src/Ursa/Controls/Dialog/OverlayDialog.cs
index 28ed9e3..cdbeed2 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialog.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialog.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Layout;
 
 namespace Ursa.Controls;
@@ -93,6 +94,7 @@ public static class OverlayDialog
         {
             Content = view,
             DataContext = vm,
+            [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle
         };
         ConfigureCustomDialogControl(t, options);
         host.AddDialog(t);
@@ -108,6 +110,7 @@ public static class OverlayDialog
         {
             Content = new TView(),
             DataContext = vm,
+            [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle
         };
         ConfigureDefaultDialogControl(t, options);
         host.AddModalDialog(t);
@@ -123,6 +126,7 @@ public static class OverlayDialog
         {
             Content = control,
             DataContext = vm,
+            [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle
         };
         ConfigureDefaultDialogControl(t, options);
         host.AddModalDialog(t);
@@ -139,6 +143,7 @@ public static class OverlayDialog
         {
             Content = new TView(),
             DataContext = vm,
+            [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle
         };
         ConfigureCustomDialogControl(t, options);
         host.AddModalDialog(t);
@@ -154,6 +159,7 @@ public static class OverlayDialog
         {
             Content = control,
             DataContext = vm,
+            [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle
         };
         ConfigureCustomDialogControl(t, options);
         host.AddModalDialog(t);
@@ -172,6 +178,7 @@ public static class OverlayDialog
         {
             Content = view,
             DataContext = vm,
+            [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle
         };
         ConfigureCustomDialogControl(t, options);
         host.AddModalDialog(t);
diff --git a/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Dialog.cs b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Dialog.cs
index 7614624..0368aec 100644
--- a/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Dialog.cs
+++ b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Dialog.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Input;
+using Avalonia.VisualTree;
 using Irihi.Avalonia.Shared.Helpers;
 using Irihi.Avalonia.Shared.Shapes;
 using Ursa.Controls.OverlayShared;
@@ -170,6 +171,9 @@ public partial class OverlayDialogHost
         {
             _maskAppearAnimation.RunAsync(mask);
         }
+
+        var element = control.GetVisualDescendants().OfType<InputElement>().FirstOrDefault(a => a.Focusable);
+        element?.Focus();
         _modalCount++;
         IsInModalStatus = _modalCount > 0;
         control.IsClosed = false;
diff --git a/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs b/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
index e8103cb..50cc65a 100644
--- a/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
+++ b/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
@@ -20,7 +20,7 @@ public abstract class OverlayFeedbackElement: ContentControl
     
     static OverlayFeedbackElement()
     {
-        FocusableProperty.OverrideDefaultValue<OverlayFeedbackElement>(true);
+        FocusableProperty.OverrideDefaultValue<OverlayFeedbackElement>(false);
         DataContextProperty.Changed.AddClassHandler<OverlayFeedbackElement, object?>((o, e) => o.OnDataContextChange(e));
         ClosedEvent.AddClassHandler<OverlayFeedbackElement>((o,e)=>o.OnClosed(e));
     }