diff --git a/src/line_break.c b/src/line_break.c
index a4dd6475af..bb601a0d76 100644
--- a/src/line_break.c
+++ b/src/line_break.c
@@ -176,7 +176,6 @@ void BreakSubStringNaive(u8 *src, u32 maxWidth, u32 screenLines, u8 fontId, enum
 
     Free(allWords);
 }
-#undef SCROLL_PROMPT_WIDTH
 
 void BreakSubStringAutomatic(u8 *src, u32 maxWidth, u32 screenLines, u8 fontId, enum ToggleScrollPrompt toggleScrollPrompt)
 {
@@ -246,6 +245,9 @@ void BreakSubStringAutomatic(u8 *src, u32 maxWidth, u32 screenLines, u8 fontId,
     for (u32 i = 1; i < numWords; i++)
         totalWidth += allWords[i].width + spaceWidth;
 
+    if (toggleScrollPrompt == SHOW_SCROLL_PROMPT)
+        totalWidth += SCROLL_PROMPT_WIDTH;
+
     //  If it doesn't fit on 1 line, do fancy line break calculation
     //  NOTE: Currently the line break calculation isn't fancy
     if (totalWidth > maxWidth)
@@ -256,6 +258,8 @@ void BreakSubStringAutomatic(u8 *src, u32 maxWidth, u32 screenLines, u8 fontId,
         bool32 shouldTryAgain;
         for (currWordIndex = 0; currWordIndex < numWords; currWordIndex++)
         {
+            if (toggleScrollPrompt == SHOW_SCROLL_PROMPT && currWordIndex + 1 == numWords)
+                currLineWidth += SCROLL_PROMPT_WIDTH;
             if (currLineWidth + allWords[currWordIndex].length > maxWidth)
             {
                 totalLines++;
@@ -266,6 +270,10 @@ void BreakSubStringAutomatic(u8 *src, u32 maxWidth, u32 screenLines, u8 fontId,
                 currLineWidth += allWords[currWordIndex].width + spaceWidth;
             }
         }
+
+        if (currLineWidth > maxWidth)
+            totalLines++;
+
         //  LINE LAYOUT STARTS HERE
         struct StringLine *stringLines;
         do
@@ -424,3 +432,4 @@ bool32 StringHasManualBreaks(u8 *src)
     }
     return FALSE;
 }
+#undef SCROLL_PROMPT_WIDTH