diff --git a/CHANGELOG.md b/CHANGELOG.md
index ede63057..90e0f76f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ CHANGELOG for FlatCAM beta
 - fixed the workspace being always A4
 - added a label in the status bar to show if the workplace is active and what size it is
 - now the Edit command (either from Menu Edit ->Edit Object) or through the shortcut key (E key) or project tab context menu works also for the CNCJob objects (will open a text Editor with the GCode)
+- grid snap toolbar is now always active
 
 16.05.2020
 
diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 48ab95da..16981723 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -2506,10 +2506,13 @@ class App(QtCore.QObject):
         else:
             self.ui.grb_edit_toolbar.setVisible(False)
 
-        if tb & 128:
-            self.ui.snap_toolbar.setVisible(True)
-        else:
-            self.ui.snap_toolbar.setVisible(False)
+        # if tb & 128:
+        #     self.ui.snap_toolbar.setVisible(True)
+        # else:
+        #     self.ui.snap_toolbar.setVisible(False)
+
+        # Grid Toolbar is always active now
+        self.ui.snap_toolbar.setVisible(True)
 
         if tb & 256:
             self.ui.toolbarshell.setVisible(True)