diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
index 557c024587..4d590f2b77 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
@@ -87,9 +87,9 @@ void SketcherGeneralWidget::loadSettings()
     ui->gridSize->setToLastUsedValue();
     ui->checkBoxGridSnap->setChecked(hGrp->GetBool("GridSnap", ui->checkBoxGridSnap->isChecked()));
     ui->checkBoxAutoconstraints->setChecked(hGrp->GetBool("AutoConstraints", ui->checkBoxAutoconstraints->isChecked()));
-    
+
     ParameterGrp::handle hGrpp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher");
-    
+
     // 1->Normal Geometry, 2->Construction, 3->External
     int topid = hGrpp->GetInt("TopRenderGeometryId",1);
     int midid = hGrpp->GetInt("MidRenderGeometryId",2);
@@ -133,8 +133,14 @@ void SketcherGeneralWidget::checkAutoconstraints(bool on)
     ui->checkBoxAutoconstraints->setChecked(on);
 }
 
+bool SketcherGeneralWidget::isGridViewChecked() const
+{
+    return ui->checkBoxShowGrid->isChecked();
+}
+
 void SketcherGeneralWidget::onToggleGridView(bool on)
 {
+    checkGridView(on);
     ui->label->setEnabled(on);
     ui->gridSize->setEnabled(on);
     ui->checkBoxGridSnap->setEnabled(on);
@@ -217,6 +223,11 @@ TaskSketcherGeneral::TaskSketcherGeneral(ViewProviderSketch *sketchView)
     Gui::Selection().Attach(this);
     QSignalBlocker block(widget);
     widget->loadSettings();
+
+    // only the widget knows the preset, view control disables the grid automatically
+    // when leaving edit mode. See bool ViewProviderSketch::setEdit(int ModNum)
+    onToggleGridView(widget->isGridViewChecked());
+
     widget->setGridSize(sketchView->GridSize.getValue());
     widget->checkGridView(sketchView->ShowGrid.getValue());
     widget->checkGridSnap(sketchView->GridSnap.getValue());
@@ -259,6 +270,7 @@ void TaskSketcherGeneral::onToggleGridView(bool on)
 {
     Base::ConnectionBlocker block(changedSketchView);
     sketchView->ShowGrid.setValue(on);
+    widget->saveSettings();
 }
 
 void TaskSketcherGeneral::onSetGridSize(double val)
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h
index faad23a7b6..20d2b889d4 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h
+++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h
@@ -57,6 +57,8 @@ public:
     void checkGridSnap(bool);
     void checkAutoconstraints(bool);
 
+    bool isGridViewChecked() const;
+
 Q_SIGNALS:
     void emitToggleGridView(bool);
     void emitToggleGridSnap(int);