diff --git a/Source/Engine/Render2D/FontManager.cpp b/Source/Engine/Render2D/FontManager.cpp
index 2c75a6f23..7376173f8 100644
--- a/Source/Engine/Render2D/FontManager.cpp
+++ b/Source/Engine/Render2D/FontManager.cpp
@@ -258,6 +258,10 @@ bool FontManager::AddNewEntry(Font* font, Char c, FontCharacterEntry& entry)
     {
         // Generate bitmap for MSDF
         FT_GlyphSlot glyph = face->glyph;
+
+        // Set advance in advance
+        entry.AdvanceX = Convert26Dot6ToRoundedPixel<int16>(glyph->advance.x);
+
         int16 msdf_top = 0;
         int16 msdf_left = 0;
         MSDFGenerator::GenerateMSDF(glyph, GlyphImageData, glyphWidth, glyphHeight, msdf_top, msdf_left);
@@ -268,8 +272,7 @@ bool FontManager::AddNewEntry(Font* font, Char c, FontCharacterEntry& entry)
             return false;
         }
 
-        // Fill the character data
-        entry.AdvanceX = Convert26Dot6ToRoundedPixel<int16>(glyph->advance.x);
+        // Fill the remaining character data
         entry.OffsetY = msdf_top;
         entry.OffsetX = msdf_left;
         entry.IsValid = true;
diff --git a/Source/Engine/Render2D/MSDFGenerator.h b/Source/Engine/Render2D/MSDFGenerator.h
index 4db941211..0ac431878 100644
--- a/Source/Engine/Render2D/MSDFGenerator.h
+++ b/Source/Engine/Render2D/MSDFGenerator.h
@@ -124,6 +124,6 @@ public:
         outputWidth = width;
         outputHeight = height;
         top = static_cast<int16>(Math::CeilToInt(bounds.t + pxRange / 2.0));
-        left = static_cast<int16>(Math::FloorToInt(bounds.l + pxRange / 2.0));
+        left = static_cast<int16>(Math::FloorToInt(bounds.l - pxRange / 2.0));
     }
 };