diff --git a/Perspex.Controls/Control.cs b/Perspex.Controls/Control.cs
index 8b98f0fd7e..97d6a94c36 100644
--- a/Perspex.Controls/Control.cs
+++ b/Perspex.Controls/Control.cs
@@ -355,7 +355,9 @@ namespace Perspex.Controls
         {
             base.OnGotFocus(e);
 
-            if (this.IsFocused && e.NavigationMethod == NavigationMethod.Tab)
+            if (this.IsFocused &&
+                (e.NavigationMethod == NavigationMethod.Tab ||
+                 e.NavigationMethod == NavigationMethod.Directional))
             {
                 var adornerLayer = AdornerLayer.GetAdornerLayer(this);