diff --git a/pixler.bas b/pixler.bas
index 0c15dff..8fc193d 100644
--- a/pixler.bas
+++ b/pixler.bas
@@ -187,8 +187,8 @@ do
     canvas
     if showtoolbox then toolbox
     if showcolorpicker then colorpicker
-    if showcommands then commandlist
     if state.tool = 12 then drawTextToolPanel
+    if showcommands then commandlist
     _limit 30
     _display
 loop
@@ -221,6 +221,12 @@ sub drawTextToolPanel
     dim x as integer: x = _width - panelWidth
     static showFontList as integer ' Tracks the expanding drop-down list state
 
+    if showcommands then
+        x = _width - panelWidth - 250
+    else
+        x = _width - panelWidth
+    end if
+
     ' Draw the side panel background card block
     line (x, 0)-(_width - 1, _height - 1), backgroundcolor1, bf
     line (x, 0)-(x, _height - 1), backgroundcolor2