diff --git a/CHANGELOG.md b/CHANGELOG.md
index 051529f8..3f7d0ef1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG for FlatCAM beta
 16.11.2020
 
 - modified the behavior of the Tool Tab in the Notebook widget. Now the app start with the Tool Tab off. If an App Tool is launched then the Tool Tab is added and populated. If the same App Tool is launched again and the focus is in its Tool Tab then the Tool Tab is removed but if the focus is elsewhere then the focus is set again on the Tool Tab.
+- fixed the App Tools buttons in the Tools section of the Properties Tab for Excellon, Gerber and Geometry objects
 
 15.11.2020
 
diff --git a/appObjects/FlatCAMExcellon.py b/appObjects/FlatCAMExcellon.py
index 955b5998..b261626b 100644
--- a/appObjects/FlatCAMExcellon.py
+++ b/appObjects/FlatCAMExcellon.py
@@ -632,7 +632,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
         self.ui.treeWidget.resize_sig.emit()
 
     def on_milling_button_clicked(self):
-        self.app.milling_tool.run(toggle=False)
+        self.app.milling_tool.run(toggle=True)
         self.app.milling_tool.ui.target_radio.set_value('exc')
         current_obj = self.app.collection.get_active()
         self.app.milling_tool.ui.object_combo.set_value(current_obj.options['name'])
diff --git a/appObjects/FlatCAMGeometry.py b/appObjects/FlatCAMGeometry.py
index 351684db..f60a3c87 100644
--- a/appObjects/FlatCAMGeometry.py
+++ b/appObjects/FlatCAMGeometry.py
@@ -655,8 +655,8 @@ class GeometryObject(FlatCAMObj, Geometry):
 
         # Buttons Signals
         self.ui.generate_cnc_button.clicked.connect(self.on_generatecnc_button_click)
-        self.ui.paint_tool_button.clicked.connect(lambda: self.app.paint_tool.run(toggle=False))
-        self.ui.generate_ncc_button.clicked.connect(lambda: self.app.ncclear_tool.run(toggle=False))
+        self.ui.paint_tool_button.clicked.connect(lambda: self.app.paint_tool.run(toggle=True))
+        self.ui.generate_ncc_button.clicked.connect(lambda: self.app.ncclear_tool.run(toggle=True))
         self.ui.milling_button.clicked.connect(self.on_milling_button_clicked)
 
         # Postprocessor change
@@ -700,7 +700,7 @@ class GeometryObject(FlatCAMObj, Geometry):
         self.ui.treeWidget.resize_sig.emit()
 
     def on_milling_button_clicked(self):
-        self.app.milling_tool.run(toggle=False)
+        self.app.milling_tool.run(toggle=True)
         self.app.milling_tool.ui.target_radio.set_value('geo')
         current_obj = self.app.collection.get_active()
         self.app.milling_tool.ui.object_combo.set_value(current_obj.options['name'])
diff --git a/appObjects/FlatCAMGerber.py b/appObjects/FlatCAMGerber.py
index 20a0ecc6..18bf8247 100644
--- a/appObjects/FlatCAMGerber.py
+++ b/appObjects/FlatCAMGerber.py
@@ -153,10 +153,10 @@ class GerberObject(FlatCAMObj, Gerber):
         self.calculations_finished.connect(self.update_area_chull)
 
         # Tools
-        self.ui.iso_button.clicked.connect(self.app.isolation_tool.run)
-        self.ui.generate_ncc_button.clicked.connect(self.app.ncclear_tool.run)
-        self.ui.generate_cutout_button.clicked.connect(self.app.cutout_tool.run)
-        self.ui.generate_follow_button.clicked.connect(self.app.follow_tool.run)
+        self.ui.iso_button.clicked.connect(lambda: self.app.isolation_tool.run(toggle=True))
+        self.ui.generate_ncc_button.clicked.connect(lambda: self.app.ncclear_tool.run(toggle=True))
+        self.ui.generate_cutout_button.clicked.connect(lambda: self.app.cutout_tool.run(toggle=True))
+        self.ui.generate_follow_button.clicked.connect(lambda: self.app.follow_tool.run(toggle=True))
 
         # Utilties
         self.ui.generate_bb_button.clicked.connect(self.on_generatebb_button_click)