diff --git a/src/emc/usr_intf/axis/scripts/axis.py b/src/emc/usr_intf/axis/scripts/axis.py
index fb1122c..59ae288 100755
--- a/src/emc/usr_intf/axis/scripts/axis.py
+++ b/src/emc/usr_intf/axis/scripts/axis.py
@@ -2253,10 +2253,12 @@ class TclCommands(nf.TclCommands):
             doHoming=prompt_areyousure(_("Warning"),_("Axis is already homed, are you sure you want to re-home?"))
         if doHoming:
             c.home(-1)
+            ensure_mode(linuxcnc.MODE_MDI)
+            c.wait_complete()
             # clear G54 offset
-            clear_offset(1)
+            commands.clear_offset(1)
             # clear G55 offset
-            clear_offset(2)
+            commands.clear_offset(2)
 
     def unhome_all_axes(event=None):
         if not manual_ok(): return