diff --git a/meta-opencentauri/recipes-apps/klipper/files/macros.cfg b/meta-opencentauri/recipes-apps/klipper/files/macros.cfg
index 35a4c9d..17616ef 100644
--- a/meta-opencentauri/recipes-apps/klipper/files/macros.cfg
+++ b/meta-opencentauri/recipes-apps/klipper/files/macros.cfg
@@ -182,6 +182,7 @@ gcode:
             {% endif %}
         {% endif %}
 
+        G90 ; back to absolute positioning, MOVE_TO_TRAY returns early when already at the tray
         MOVE_TO_TRAY
     {% endif %}
     TURN_OFF_FANS
@@ -573,6 +574,7 @@ gcode:
         G28 Y
     {% endif %}
     {% if 'Z' in rawparams %}
+        G90 ; the FORCE_MOVE branch above leaves whatever positioning mode was active
         G0 X128 Y128 F6000
         G28 Z
     {% endif %}