diff --git a/docs/src/gui/gmoccapy.adoc b/docs/src/gui/gmoccapy.adoc
index 04b55058d73..10e9e9c7b36 100644
--- a/docs/src/gui/gmoccapy.adoc
+++ b/docs/src/gui/gmoccapy.adoc
@@ -602,15 +602,15 @@ m| gmoccapy.h-button.button-9 | exit if machine is off, otherwise nothing | open
 [cols="10,10,10,10", options="header"]
 |===
 | Pin                        | Settings Mode         | Homing Mode | Touch off Mode
-m|gmoccapy.h-button.button-0 | delete MDI history    |             | edit offsets
-m|gmoccapy.h-button.button-1 |                       | home all    | touch X
-m|gmoccapy.h-button.button-2 |                       |             | touch Y
-m|gmoccapy.h-button.button-3 |                       | home x      | touch Z
+m|gmoccapy.h-button.button-0 | delete MDI history    |             | touch X
+m|gmoccapy.h-button.button-1 |                       | home all    | touch Y
+m|gmoccapy.h-button.button-2 |                       |             | touch Z
+m|gmoccapy.h-button.button-3 |                       | home x      |
 m|gmoccapy.h-button.button-4 | open classic ladder   | home y      |
 m|gmoccapy.h-button.button-5 | open HAL scope        | home z      |
-m|gmoccapy.h-button.button-6 | open HAL status       |             | zero G92
+m|gmoccapy.h-button.button-6 | open HAL status       |             |
 m|gmoccapy.h-button.button-7 | open HAL meter        |             |
-m|gmoccapy.h-button.button-8 | open HAL calibration  | unhome all  | set selected
+m|gmoccapy.h-button.button-8 | open HAL calibration  | unhome all  |
 m|gmoccapy.h-button.button-9 | open HAL show         | back        | back
 |===
 
diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py
index a0164be8526..905e2a51c06 100644
--- a/src/emc/usr_intf/gmoccapy/gmoccapy.py
+++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py
@@ -1002,7 +1002,7 @@ def _make_touch_button(self):
 
         dic = self.axis_list
         num_elements = len(dic)
-        end = 8
+        end = 9
 
         if self.tool_measure_OK:
             end -= 1
@@ -4742,7 +4742,7 @@ def on_tbtn_edit_offsets_toggled(self, widget, data=None):
             widgetlist.append("tbtn_user_tabs")
         self._sensitize_widgets( widgetlist, not state )
         for element in self.touch_button_dic:
-            if self.touch_button_dic[element].get_property("name") in ["edit_offsets", "touch_back"]:
+            if self.touch_button_dic[element].get_property("name") in ["touch_back"]:
                 continue
             self.touch_button_dic[element].set_sensitive(not state)