diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings
index 12bcbb736530e748a22b840a15133ede7f1a712e..223041a6eab78d0dfad960fff7c508488cf487fd 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings
@@ -2,7 +2,7 @@ DiagramCoordinate.java 6b00aec99054d4cd19003a72bd4e5e774ac6a641 GREEN
 DiagramLayers.java aa1f95dbae290c8b00202abe4385b01b8f36e5ab GREEN
 DiagramViewer.java 537358db18da8b5ba2bf56082bfd87dec3ca88d8 GREEN
 DiagramViewerDefaultTags.java 6230763252409c60009ab8887b4ef582cf883229 GREEN
-DiagramViewerFeatures.java b48515b91e81cb07b405a92ab02925815f128ce9 YELLOW
+DiagramViewerFeatures.java b48515b91e81cb07b405a92ab02925815f128ce9 GREEN
 DiagramViewerSelection.java e833f592543bc97077907d980a39b123fc4044e6 GREEN
 EDragGesture.java 5cfa098d3877db11981c2750e5e103156d62fc5e GREEN
 FeedbackChange.java b088fa89af648f1674f2f9c1f7f99d585ce801ca GREEN
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
index b454b3e56970a6ff4a48632fba403b4f8aaa0c87..cde76d528cb57a5c623a54a91820e7144df540bc 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
@@ -2,7 +2,7 @@ AnchorageContentControllerBase.java da56b10cbf2711b5da69f0b59f43eacbe54f4eea GRE
 ClickControllerBase.java 8e5861ed5f9318008ad0fdd5497ed320cd5bd647 GREEN
 ContentAnchorageMoveControllerBase.java c18e7915ce23e124757f5b736086ecc46694800a GREEN
 ControllerBase.java 9311521b252e46640e26d409610e527fd5ed6922 GREEN
-DefaultDiagramController.java f30b755bc068d6f634b705b99a5cd31f8c8272b7 YELLOW
+DefaultDiagramController.java f707d03674e42aacc7d5d8b3eb8d15b45add2004 YELLOW
 DelegatingContentAnchorageController.java 1889628a346a2183082ffe213978f9d15a949494 GREEN
 DragControllerBase.java b15ff874304f679fe494d85f57cc8cbe4d0d1d15 GREEN
 DraggingUtils.java 95117e2ea4c36b6c6a31f8088bb95b484e0e6612 GREEN
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/DefaultDiagramController.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/DefaultDiagramController.java
index f30b755bc068d6f634b705b99a5cd31f8c8272b7..f707d03674e42aacc7d5d8b3eb8d15b45add2004 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/DefaultDiagramController.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/DefaultDiagramController.java
@@ -34,9 +34,6 @@ public class DefaultDiagramController extends ControllerBase {
 	/** Flag for ignoring mouse click event after dragging gesture. */
 	private boolean ignoreNextMouseClick = false;
 
-	/** Previous grid indicator type (to restore grid after it has been hidden). */
-	private IndicatorType previousGridIndicatorType = null;
-
 	/** Constructor. */
 	public DefaultDiagramController(IMVCBundle mvcb) {
 		super(mvcb);
@@ -84,20 +81,12 @@ public class DefaultDiagramController extends ControllerBase {
 		MenuItem gridMenuItem = null;
 		if(features.getIndicatorType() == IndicatorType.INVISIBLE) {
 			gridMenuItem = new MenuItem("Show Grid");
-
-			if(previousGridIndicatorType != null) {
-				gridMenuItem.setOnAction(evt -> {
-					features.setIndicatorType(previousGridIndicatorType);
-				});
-			} else {
-				gridMenuItem.setOnAction(evt -> {
-					features.setIndicatorTypeToDefault();
-				});
-			}
+			gridMenuItem.setOnAction(evt -> {
+				features.setIndicatorTypeToDefault();
+			});
 		} else {
 			gridMenuItem = new MenuItem("Hide Grid");
 			gridMenuItem.setOnAction(evt -> {
-				previousGridIndicatorType = features.getIndicatorType();
 				features.setIndicatorType(IndicatorType.INVISIBLE);
 			});
 		}