diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index c7a3c50d1b..74c16a0594 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -1201,6 +1201,10 @@ public class DeviceProfile {
         final boolean isVerticalLayout = isVerticalBarLayout();
         cellLayoutBorderSpacePx = getCellLayoutBorderSpace(inv, scale);
 
+        // Lawnchair: Get initial text size before calculating layout
+        // This scales offset with text sizing, all the way down to zero
+        iconTextSizePx *= mTextFactors.getIconTextSizeFactor();
+
         if (mIsResponsiveGrid) {
             cellWidthPx = mResponsiveWorkspaceWidthSpec.getCellSizePx();
             cellHeightPx = mResponsiveWorkspaceHeightSpec.getCellSizePx();
@@ -1314,8 +1318,6 @@ public class DeviceProfile {
             }
         }
 
-        iconTextSizePx *= mTextFactors.getIconTextSizeFactor();
-
         // All apps
         if (mIsResponsiveGrid) {
             mAllAppsProfile = AllAppsProfile.Factory.createAllAppsWithResponsive(