diff --git a/src/js/control-view.js b/src/js/control-view.js
index b16dd17..2c65191 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -165,10 +165,6 @@ module.exports = {
       // return this.is_idle || this.is_paused;
     },
 
-    can_load_origin: function (axis) {
-      return this.is_idle && this.state["offset_" + axis] == 0;
-    },
-
     message: function () {
       if (this.mach_state == "ESTOPPED") {
         return this.state.er;
@@ -786,7 +782,7 @@ module.exports = {
     load_position: function (axes) {
       try {
         for (const axis of axes) {
-          if (this.config.axes["offset_" + axis]) {
+          if (this.config.axes["offset_" + axis] && this.state["offset_" + axis] == 0) {
             this.set_position(axis, -this.config.axes["offset_" + axis]);
           }
         }
diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug
index fe60222..8cee244 100644
--- a/src/pug/templates/control-view.pug
+++ b/src/pug/templates/control-view.pug
@@ -163,7 +163,7 @@ script#control-view-template(type="text/x-template")
                     title=`Home {{'${axis}' | upper}} axis.`, style="height:60px;width:60px")
                     .fa.fa-home
 
-                  button.pure-button(:disabled="!can_load_origin", @click=`load_position('${axis}')`,
+                  button.pure-button(:disabled="!can_set_axis", @click=`load_position('${axis}')`,
                     title=`Load {{'${axis}' | upper}} origin.`, style="height:60px;width:60px")
                     .fa.fa-map-pin