diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.cpp b/src/Mod/Part/Gui/ViewProvider2DObject.cpp
index c3748abf0c..134d73466f 100644
--- a/src/Mod/Part/Gui/ViewProvider2DObject.cpp
+++ b/src/Mod/Part/Gui/ViewProvider2DObject.cpp
@@ -258,8 +258,8 @@ void ViewProvider2DObject::onChanged(const App::Property* prop)
     // call father
     ViewProviderPart::onChanged(prop);
 
-    if (prop == &ShowGrid) {
-        if (ShowGrid.getValue())
+    if (prop == &ShowGrid || prop == &Visibility) {
+        if (ShowGrid.getValue() && Visibility.getValue())
             createGrid();
         else
             Gui::coinRemoveAllChildren(GridRoot);
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
index 6821a892ae..dd8161a90f 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
@@ -294,6 +294,7 @@ void TaskSketcherGeneral::onToggleGridView(bool on)
     Base::ConnectionBlocker block(changedSketchView);
     sketchView->ShowGrid.setValue(on);
     widget->enableGridSettings(on);
+    if (on) sketchView->createGrid();
 }
 
 void TaskSketcherGeneral::onSetGridSize(double val)
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
index 6d974d3093..56045f521a 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
@@ -5701,8 +5701,6 @@ bool ViewProviderSketch::setEdit(int ModNum)
         Base::Console().Warning("ViewProviderSketch::setEdit: could not import Show module. Visibility automation will not work.\n");
     }
 
-
-    ShowGrid.setValue(true);
     TightGrid.setValue(false);
 
     float transparency;
@@ -6080,7 +6078,6 @@ void ViewProviderSketch::createEditInventorNodes(void)
 void ViewProviderSketch::unsetEdit(int ModNum)
 {
     Q_UNUSED(ModNum);
-    ShowGrid.setValue(false);
     TightGrid.setValue(true);
 
     if(listener) {