diff --git a/scripts/menus/tui_layout.sh b/scripts/menus/tui_layout.sh
index 8a44f335..5f3bcea3 100644
--- a/scripts/menus/tui_layout.sh
+++ b/scripts/menus/tui_layout.sh
@@ -29,15 +29,14 @@ content_line() {
            currentLine = ""
            wordBuffer = ""
            lastColor = ""
+           savedColor = ""
            ESC = sprintf("%c", 27)
        }
 
        {
            n = split($0, chars, "")
-
            for (i = 1; i <= n; i++) {
                r = chars[i]
-
                if (r == ESC && i+1 <= n && chars[i+1] == "[") {
                    ansiSeq = ""
                    for (j = i; j <= n; j++) {
@@ -53,10 +52,7 @@ content_line() {
                }
 
                charWidth = 1
-
-               if (r <= "\177") {
-                   charWidth = 1
-               }
+               if (r <= "\177") { charWidth = 1 }
                else if (r >= "\340" && r <= "\357" && i+2 <= n) {
                    r = chars[i] chars[i+1] chars[i+2]
                    i += 2
@@ -67,56 +63,54 @@ content_line() {
                    i += 1
                    charWidth = 1
                }
-               else {
-                   charWidth = 1
-               }
 
                if (r == " " || charWidth == 2) {
                    if (currentDisplayWidth + wordWidth + charWidth > textWidth) {
                        printf " %s\033[0m\033[%dG||\n", currentLine, table_width
-                       currentLine = lastColor wordBuffer
+                       currentLine = savedColor wordBuffer
                        currentDisplayWidth = wordWidth
                        wordBuffer = r
                        wordWidth = charWidth
+                       savedColor = lastColor
                    } else {
                        currentLine = currentLine wordBuffer r
                        currentDisplayWidth += wordWidth + charWidth
                        wordBuffer = ""
                        wordWidth = 0
+                       savedColor = lastColor
                    }
                } else {
                    wordBuffer = wordBuffer r
                    wordWidth += charWidth
-
                    if (wordWidth > textWidth) {
                        printf " %s%s\033[0m\033[%dG||\n", currentLine, wordBuffer, table_width
-                       currentLine = lastColor
+                       currentLine = savedColor
                        currentDisplayWidth = 0
                        wordBuffer = ""
                        wordWidth = 0
+                       savedColor = lastColor
                    }
                }
            }
-       }
 
-       END {
            if (wordWidth > 0) {
                if (currentDisplayWidth + wordWidth > textWidth) {
                    printf " %s\033[0m\033[%dG||\n", currentLine, table_width
-                   currentLine = lastColor wordBuffer
+                   currentLine = savedColor wordBuffer
                } else {
                    currentLine = currentLine wordBuffer
                }
            }
 
-           cleanText = currentLine
-           gsub(/\033\[[0-9;]*m/, "", cleanText)
-           gsub(/^[ \t]+|[ \t]+$/, "", cleanText)
+           printf " %s\033[0m\033[%dG||\n", currentLine, table_width
 
-           if (cleanText != "") {
-               printf " %s\033[0m\033[%dG||\n", currentLine, table_width
-           }
+           currentLine = lastColor
+           currentDisplayWidth = 0
+           wordBuffer = ""
+           wordWidth = 0
+           savedColor = lastColor
        }
+       END {}
        '
 }