diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4a937f0..c4d2dd81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ CHANGELOG for FlatCAM beta
 - update in Code Highlighter to highlight the X and Y chars
 - updated the Document and Script objects Beginner/Advanced selection labels to the same as the rest of the app objects
 - strings update
+- make sure that Autoload Tools from DB functionality from Excellon Object UI is working only with tools from DB market for Drilling Tool
 
 26.02.2021
 
diff --git a/appPlugins/ToolDrilling.py b/appPlugins/ToolDrilling.py
index e017d6f2..5ee8a7a5 100644
--- a/appPlugins/ToolDrilling.py
+++ b/appPlugins/ToolDrilling.py
@@ -1145,6 +1145,11 @@ class ToolDrilling(AppTool, Excellon):
                     low_limit = float(db_tool_val['data']['tol_min'])
                     high_limit = float(db_tool_val['data']['tol_max'])
 
+                    # test if the targeted tool is Drilling Tool, if not, skip to next tool
+                    targeted_tool = db_tool_val['data']['tool_target']
+                    if targeted_tool != _("Drilling"):
+                        continue
+
                     # if we find a tool with the same diameter in the Tools DB just update it's data
                     if orig_tooldia == db_tooldia:
                         tool_found += 1