diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py
index 6267d9077e..2701e5616c 100644
--- a/src/Mod/Arch/InitGui.py
+++ b/src/Mod/Arch/InitGui.py
@@ -85,11 +85,15 @@ class ArchWorkbench(Workbench):
         Log ('Loading Arch module... done\n')
                 
     def Activated(self):
-        FreeCADGui.draftToolBar.Activated()
+        if hasattr(FreeCADGui,"draftToolBar"):
+            FreeCADGui.draftToolBar.Activated()
+        if hasattr(FreeCADGui,"Snapper"):
+            FreeCADGui.Snapper.show()
         Msg("Arch workbench activated\n")
                 
     def Deactivated(self):
-        FreeCADGui.draftToolBar.Deactivated()
+        if hasattr(FreeCADGui,"draftToolBar"):
+            FreeCADGui.draftToolBar.Deactivated()
         Msg("Arch workbench deactivated\n")
                 
     def ContextMenu(self, recipient):
diff --git a/src/Mod/Draft/DraftSnap.py b/src/Mod/Draft/DraftSnap.py
index 3918be2b2f..746bb7bc94 100644
--- a/src/Mod/Draft/DraftSnap.py
+++ b/src/Mod/Draft/DraftSnap.py
@@ -167,7 +167,7 @@ class Snapper:
             self.radius =  self.getScreenDist(Draft.getParam("snapRange"),screenpos)
 
         # set the grid
-        if self.grid and Draft.getParam("grid") and (not self.forceGridOff):
+        if self.grid and (not self.forceGridOff):
             self.grid.set()
         
         # activate snap
@@ -894,7 +894,7 @@ class Snapper:
 
     def setGrid(self):
         "sets the grid, if visible"
-        if self.grid:
+        if self.grid and (not self.forceGridOff):
             if self.grid.Visible:
                 self.grid.set()
         
diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py
index 3e2bd5696d..b4b83ee359 100644
--- a/src/Mod/Draft/InitGui.py
+++ b/src/Mod/Draft/InitGui.py
@@ -201,10 +201,16 @@ class DraftWorkbench (Workbench):
         self.appendMenu([str(DraftTools.translate("draft","&Draft")),str(DraftTools.translate("draft","Wire tools"))],self.lineList)
                                         
     def Activated(self):
-        FreeCADGui.draftToolBar.Activated()
-
+        if hasattr(FreeCADGui,"draftToolBar"):
+            FreeCADGui.draftToolBar.Activated()
+        if hasattr(FreeCADGui,"Snapper"):
+            FreeCADGui.Snapper.show()
+        Msg("Draft workbench activated\n")
+        
     def Deactivated(self):
-        FreeCADGui.draftToolBar.Deactivated()
+        if hasattr(FreeCADGui,"draftToolBar"):
+            FreeCADGui.draftToolBar.Deactivated()
+        Msg("Draft workbench deactivated\n")
 
     def ContextMenu(self, recipient):
         if (recipient == "View"):