diff --git a/desktop_version/src/Font.cpp b/desktop_version/src/Font.cpp
index 562ab506..f27c9f67 100644
--- a/desktop_version/src/Font.cpp
+++ b/desktop_version/src/Font.cpp
@@ -798,8 +798,6 @@ static bool next_wrap(
             goto next;
         }
 
-        linewidth += get_advance(f, str[idx]);
-
         switch (str[idx])
         {
         case ' ':
@@ -817,6 +815,8 @@ static bool next_wrap(
             return true;
         }
 
+        linewidth += get_advance(f, str[idx]);
+
         if (linewidth > maxwidth)
         {
             if (lenfromlastspace != 0)