diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index d5cae084e..27d7e49e5 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -301,6 +301,8 @@ extern float soft_endstop_min[XYZ], soft_endstop_max[XYZ];
 
 void tool_change(const uint8_t tmp_extruder, const float fr_mm_s=0.0, bool no_move=false);
 
+void  home_all_axes();
+
 void report_current_position();
 
 #if IS_KINEMATIC
diff --git a/Marlin/ubl.h b/Marlin/ubl.h
index 873e5e6ec..03380af45 100644
--- a/Marlin/ubl.h
+++ b/Marlin/ubl.h
@@ -54,7 +54,6 @@ enum MeshPointType : char { INVALID, REAL, SET_IN_BITMAP };
 // External references
 
 char *ftostr43sign(const float&, char);
-void home_all_axes();
 
 extern uint8_t ubl_cnt;
 
diff --git a/Marlin/ubl_G29.cpp b/Marlin/ubl_G29.cpp
index 0286a7685..2345da715 100644
--- a/Marlin/ubl_G29.cpp
+++ b/Marlin/ubl_G29.cpp
@@ -296,10 +296,10 @@
 
     // Check for commands that require the printer to be homed
     if (may_move) {
-      if (axis_unhomed_error()) home_all_axes();
       #if ENABLED(DUAL_X_CARRIAGE)
         if (active_extruder != 0) tool_change(0);
       #endif
+      if (axis_unhomed_error()) home_all_axes();
     }
 
     // Invalidate Mesh Points. This command is a little bit asymmetrical because