diff --git a/src/app/App.tsx b/src/app/App.tsx
index d7dc4ec5..ffc27f84 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -15302,13 +15302,15 @@ export function App({
               currentMaterialId === null
                 ? null
                 : (editorState.document.materials[currentMaterialId] ?? null);
+            const tileSizeMeters =
+              resolveMaterialUvTileSizeMeters(currentMaterial);
 
-            return currentMaterial === null
+            return tileSizeMeters === null
               ? createFitToFaceBoxBrushFaceUvState(selectedBrush, faceId)
               : createFitToMaterialTileBoxBrushFaceUvState(
                   selectedBrush,
                   faceId,
-                  getStarterMaterialTileSizeMeters(currentMaterial)
+                  tileSizeMeters
                 );
           }
         })
@@ -15325,12 +15327,12 @@ export function App({
     }
 
     applyFaceUvState(
-      selectedFaceMaterial === undefined || selectedFaceMaterial === null
+      resolveMaterialUvTileSizeMeters(selectedFaceMaterial) === null
         ? createFitToFaceBoxBrushFaceUvState(selectedBrush, selectedFaceId)
         : createFitToMaterialTileBoxBrushFaceUvState(
             selectedBrush,
             selectedFaceId,
-            getStarterMaterialTileSizeMeters(selectedFaceMaterial)
+            resolveMaterialUvTileSizeMeters(selectedFaceMaterial)!
           ),
       "Fit face UV to face",
       "Fit the selected face UVs to the face bounds."