diff --git a/lib/python/gladevcp/tooledit_widget.py b/lib/python/gladevcp/tooledit_widget.py
index 8f21e9db42c..8bdb5677d9d 100644
--- a/lib/python/gladevcp/tooledit_widget.py
+++ b/lib/python/gladevcp/tooledit_widget.py
@@ -512,7 +512,7 @@ def validate_input(self, path, new_text, col):
 
         if col in(1,2):
             try:
-                self.model[path][col] = int(new_text)
+                self.model[path][col] = abs(int(float(new_text.replace(',', '.'))))
             except:
                 pass
         # validate input for float columns
diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py
index 1e6852dcc90..8ece446648e 100644
--- a/src/emc/usr_intf/gmoccapy/gmoccapy.py
+++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py
@@ -2101,11 +2101,12 @@ def on_tool_col_edit_started(self, widget, filtered_path, new_text, col):
         toolpage = self.widgets.tooledit1
         toolview = toolpage.view1
         model, treeiter = toolview.get_selection().get_selected()
+        integer_cols = [1,2,15]
         value = self.dialogs.entry_dialog(self,
                                     data=model[treeiter][col],
                                     header=_("Enter value"),
                                     label=_("Tool") + f" {model[treeiter][1]}, {captations[col]}:",
-                                    integer=col in [1,2,15])
+                                    integer=col in integer_cols)
         if value == "ERROR":
             LOG.debug("conversion error")
             self.dialogs.warning_dialog(self, _("Conversion error !"),
@@ -2118,7 +2119,10 @@ def on_tool_col_edit_started(self, widget, filtered_path, new_text, col):
             # Clicking on a cell emits 'editing-started' which leads to the evaluation of the text in edit mode.
             # To use the return value of the calculator, it must be pretended that there is no editable (=no edit mode).
             self.widgets.tooledit1.editable = None
-            self.widgets.tooledit1.validate_input(row, f"{value:11.4f}", col)
+            if col in integer_cols:
+                self.widgets.tooledit1.validate_input(row, f"{value:11d}", col)
+            else:
+                self.widgets.tooledit1.validate_input(row, f"{value:11.4f}", col)
             self.widgets.tooledit1.edited = True
         # this is needed to get offsetview out of editing mode
         GLib.timeout_add(50,