diff --git a/docs/src/gui/gmoccapy.adoc b/docs/src/gui/gmoccapy.adoc
index 04b55058d73..17dcfeb3dac 100644
--- a/docs/src/gui/gmoccapy.adoc
+++ b/docs/src/gui/gmoccapy.adoc
@@ -619,10 +619,10 @@ m|gmoccapy.h-button.button-9 | open HAL show         | back        | back
 [cols="10,10,10,10", options="header"]
 |===
 | Pin                        | Tool Mode                                | Edit Mode     | Select File
-m|gmoccapy.h-button.button-0 | delete tool(s)                           |               | go to home directory
-m|gmoccapy.h-button.button-1 | new tool                                 | reload file   | one directory level up
-m|gmoccapy.h-button.button-2 | reload tool table                        | save          |
-m|gmoccapy.h-button.button-3 | apply changes                            | save as       | move selection left
+m|gmoccapy.h-button.button-0 |                                          |               | go to home directory
+m|gmoccapy.h-button.button-1 |                                          | reload file   | one directory level up
+m|gmoccapy.h-button.button-2 |                                          | save          |
+m|gmoccapy.h-button.button-3 |                                          | save as       | move selection left
 m|gmoccapy.h-button.button-4 | change tool by number T? M6              |               | move selection right
 m|gmoccapy.h-button.button-5 | set tool by number without change M61 Q? |               | jump to directory as set in settings
 m|gmoccapy.h-button.button-6 | change tool to the selected one          | new file      |
diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py
index 06b67f7bd58..7e0bcd34872 100644
--- a/src/emc/usr_intf/gmoccapy/gmoccapy.py
+++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py
@@ -5458,13 +5458,14 @@ def on_btn_save_tool_changes_clicked(self, widget, data=None):
         self.widgets.tooledit1.set_selected_tool(self.stat.tool_in_spindle)
 
     def on_btn_tool_touchoff_clicked(self, widget, data=None):
-        if not self.widgets.tooledit1.get_selected_tool():
-            message = _("No or multiple tools selected in the tool table. ")
+        tool = self.widgets.tooledit1.get_selected_row()
+        if not tool:
+            message = _("No tool selected in the tool table. ")
             message += _("Please select only one tool in the table!")
             self.dialogs.warning_dialog(self, _("Warning Tool Touch off not possible!"), message)
             return
 
-        if self.widgets.tooledit1.get_selected_tool() != self.stat.tool_in_spindle:
+        if tool != self.stat.tool_in_spindle:
             message = _("You can not touch off a tool, which is not mounted in the spindle! ")
             message += _("Your selection has been reset to the tool in spindle.")
             self.dialogs.warning_dialog(self, _("Warning Tool Touch off not possible!"), message)