diff --git a/Content/Shaders/Editor/Grid.flax b/Content/Shaders/Editor/Grid.flax
index 311867604..09ecd00e6 100644
--- a/Content/Shaders/Editor/Grid.flax
+++ b/Content/Shaders/Editor/Grid.flax
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c13729c4ec2ef534271c60fee6fff2e0489bf4445fe91aa8a2bbc3d581715602
-size 4666
+oid sha256:e5671b8b77b460a17d0a3c14174994a05cf1b3d8869d10b350de4a8053419836
+size 4647
diff --git a/Source/Shaders/Editor/Grid.shader b/Source/Shaders/Editor/Grid.shader
index f109ddd1a..45bb1ed90 100644
--- a/Source/Shaders/Editor/Grid.shader
+++ b/Source/Shaders/Editor/Grid.shader
@@ -3,7 +3,7 @@
 // Ben Golus
 // https://bgolus.medium.com/the-best-darn-grid-shader-yet-727f9278b9d8#3e73
 
-#define USE_FORWARD true;
+#define MIN_DERIV 0.00001f
 
 #include "./Flax/Common.hlsl"
 
@@ -61,11 +61,6 @@ float remap(float origFrom, float origTo, float targetFrom, float targetTo, floa
     return lerp(targetFrom, targetTo, rel);
 }
 
-float ddLength(float a)
-{
-    return length(float2(ddx(a), ddy(a)));
-}
-
 float GetLine(float pos, float scale, float thickness)
 {
     float lineWidth = thickness;
@@ -73,7 +68,7 @@ float GetLine(float pos, float scale, float thickness)
 
     float2 uvDDXY = float2(ddx(coord), ddy(coord));
 
-    float deriv = float(length(uvDDXY.xy));
+    float deriv = max(float(length(uvDDXY.xy)), MIN_DERIV);
     float drawWidth = clamp(lineWidth, deriv, 0.5);
     float lineAA = deriv * 1.5;
     float gridUV = abs(coord);
@@ -92,7 +87,7 @@ float GetGrid(float3 pos, float scale, float thickness)
 
     float4 uvDDXY = float4(ddx(coord), ddy(coord));
 
-    float2 deriv = float2(length(uvDDXY.xz), length(uvDDXY.yw));
+    float2 deriv = max(float2(length(uvDDXY.xz), length(uvDDXY.yw)), float2(MIN_DERIV, MIN_DERIV));
     float2 drawWidth = clamp(lineWidth, deriv, 0.5);
     float2 lineAA = deriv * 1.5;
     float2 gridUV = 1.0 - abs(frac(coord) * 2.0 - 1.0);