diff --git a/DialogHost.Avalonia/DialogOverlayPopupHost.axaml b/DialogHost.Avalonia/DialogOverlayPopupHost.axaml
index 3e714ac..47b4f99 100644
--- a/DialogHost.Avalonia/DialogOverlayPopupHost.axaml
+++ b/DialogHost.Avalonia/DialogOverlayPopupHost.axaml
@@ -5,6 +5,8 @@
                 TargetType="dialogHost:DialogOverlayPopupHost">
     <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
     <Setter Property="KeyboardNavigation.TabNavigation" Value="Cycle" />
+    <Setter Property="Focusable" Value="True" />
+    <Setter Property="IsTabStop" Value="False" />
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"
diff --git a/DialogHost.Avalonia/DialogOverlayPopupHost.axaml.cs b/DialogHost.Avalonia/DialogOverlayPopupHost.axaml.cs
index 9e1705f..2ef362d 100644
--- a/DialogHost.Avalonia/DialogOverlayPopupHost.axaml.cs
+++ b/DialogHost.Avalonia/DialogOverlayPopupHost.axaml.cs
@@ -126,11 +126,18 @@ private void UpdatePosition()
         }
 
         public (bool handled, IInputElement? next) GetNext(IInputElement element, NavigationDirection direction) {
+            // If current element isn't this popup host - ignoring
             if (!element.Equals(this)) {
                 return (false, null);
             }
-            var focusable = this.GetVisualDescendants().OfType<IInputElement>().FirstOrDefault(visual => visual.Focusable);
-            return (true, focusable);
+            
+            // Finding the focusable descendant
+            var focusable = this.GetVisualDescendants()
+                .OfType<IInputElement>()
+                .FirstOrDefault(visual => visual.Focusable);
+
+            // Or returning the control itself to prevent focus escaping
+            return (true, focusable ?? this);
         }
 
         /// <inheritdoc />