diff --git a/src/Avalonia.Controls/WrapPanel.cs b/src/Avalonia.Controls/WrapPanel.cs
index b6215a28cc..86f1691e70 100644
--- a/src/Avalonia.Controls/WrapPanel.cs
+++ b/src/Avalonia.Controls/WrapPanel.cs
@@ -112,13 +112,13 @@ namespace Avalonia.Controls
                 //this is the size of the child in UV space
                 var sz = new UVSize(Orientation, child.DesiredSize.Width, child.DesiredSize.Height);
 
-                if ((curLineSize.U + sz.U) > uvConstraint.U) //need to switch to another line
+                if (MathUtilities.GreaterThan(curLineSize.U + sz.U, uvConstraint.U) //need to switch to another line
                 {
                     panelSize.U = Max(curLineSize.U, panelSize.U);
                     panelSize.V += curLineSize.V;
                     curLineSize = sz;
 
-                    if (sz.U > uvConstraint.U) //the element is wider then the constrint - give it a separate line                    
+                    if (MathUtilities.GreaterThan(sz.U, uvConstraint.U)) //the element is wider then the constrint - give it a separate line                    
                     {
                         panelSize.U = Max(sz.U, panelSize.U);
                         panelSize.V += sz.V;