diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 281c567a8d..0abd3dd6df 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-06  Tom de Vries  <tdevries@suse.de>
+
+	PR tui/27680
+	* tui/tui-disasm.c (len_without_escapes): Pass ptr pointing at escape
+	to style.parse.
+
 2021-04-04  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* avr-tdep.c (avr_frame_unwind_cache): Use
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 65b300cb00..163552aede 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -61,7 +61,7 @@ len_without_escapes (const std::string &str)
   const char *ptr = str.c_str ();
   char c;
 
-  while ((c = *ptr++) != '\0')
+  while ((c = *ptr) != '\0')
     {
       if (c == '\033')
 	{
@@ -77,7 +77,10 @@ len_without_escapes (const std::string &str)
 	    }
 	}
       else
-	++len;
+	{
+	  ++len;
+	  ++ptr;
+	}
     }
   return len;
 }