diff --git a/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs b/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs
index f82ba37ac3..a777b0f13e 100644
--- a/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs
+++ b/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs
@@ -113,7 +113,7 @@ namespace Avalonia.VisualTree
                 return visual;
             }
 
-            while (true)
+            while (visual != null && target != null)
             {
                 IVisual firstParent = visual.VisualParent;
                 IVisual secondParent = target.VisualParent;
@@ -125,12 +125,9 @@ namespace Avalonia.VisualTree
 
                 visual = visual.VisualParent;
                 target = target.VisualParent;
-
-                if (visual == null || target == null)
-                {
-                    return null;
-                }
             }
+
+            return null;
         }
 
         /// <summary>