diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2068e6e9..510fec3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ CHANGELOG for FlatCAM beta
 - Milling Tool - after creating and CNCJob object, it is now auto-selected and the Property tab is automatically switched to
 - Milling Tool - various fixes
 - Line_xyx preprocessor - fixed when using multidepth cut to use the right depth
+- Milling Tool - trying to fix an error on dragging and dropping tools in the Geo Tools Table
 
 29.11.2020
 
diff --git a/appTools/ToolMilling.py b/appTools/ToolMilling.py
index f9a259a0..d4830571 100644
--- a/appTools/ToolMilling.py
+++ b/appTools/ToolMilling.py
@@ -555,9 +555,13 @@ class ToolMilling(AppTool, Excellon):
         new_tools = {}
         new_uid = 1
 
-        for current_uid in current_uid_list:
-            new_tools[new_uid] = deepcopy(self.tools[current_uid])
-            new_uid += 1
+        try:
+            for current_uid in current_uid_list:
+                new_tools[new_uid] = deepcopy(self.tools[current_uid])
+                new_uid += 1
+        except Exception as err:
+            self.app.log.debug("ToolMilling.on_geo_rebuild_ui() -> %s" % str(err))
+            return
 
         self.tools = new_tools