diff --git a/desktop_version/src/Editor.cpp b/desktop_version/src/Editor.cpp
index 412a4af4..421777db 100644
--- a/desktop_version/src/Editor.cpp
+++ b/desktop_version/src/Editor.cpp
@@ -1363,11 +1363,13 @@ void editorrender(void)
                 tx+=tg;
                 graphics.fill_rect(tx+2,ty+8,12,1,graphics.getRGB(255,255,255));
 
-                fillboxabs(4+(ed.drawmode*tg), 208,20,20,graphics.getRGB(200,200,200));
-
                 for (int i = 0; i < 10; i++)
                 {
                     fillboxabs(4+(i*tg), 208,20,20,graphics.getRGB(96,96,96));
+                    if (i == ed.drawmode)
+                    {
+                        fillboxabs(4+(ed.drawmode*tg), 208,20,20,graphics.getRGB(200,200,200));
+                    }
                     const int col = i == ed.drawmode ? 255 : 164;
                     const std::string glyph = i == 9 ? "0" : help.String(i + 1);
                     font::print(PR_FONT_8X8 | PR_BOR, 22 + i*tg - 4, 224 - 4, glyph, col, col, col);
@@ -1407,12 +1409,15 @@ void editorrender(void)
                 for (int i = 0; i < 7; i++)
                 {
                     fillboxabs(4 +  i*tg, 208, 20, 20, graphics.getRGB(96, 96, 96));
+                    if (i + 10 == ed.drawmode)
+                    {
+                        fillboxabs(4 + (ed.drawmode - 10) * tg, 208, 20, 20, graphics.getRGB(200, 200, 200));
+                    }
                     const int col = i + 10 == ed.drawmode ? 255 : 164;
                     static const char glyphs[] = "RTYUIOP";
-                    font::print(PR_FONT_8X8, 22 + i*tg - 4, 224 - 4, std::string(1, glyphs[i]), col, col, col);
+                    font::print(PR_FONT_8X8 | PR_BOR, 22 + i*tg - 4, 224 - 4, std::string(1, glyphs[i]), col, col, col);
                 }
 
-                fillboxabs(4 + (ed.drawmode - 10) * tg, 208, 20, 20, graphics.getRGB(200, 200, 200));
 
                 font::print(PR_CJK_HIGH, 4, 232, "2/2", 196, 196, 255 - help.glow);
             }