diff --git a/src/Mod/Draft/draftguitools/gui_grid.py b/src/Mod/Draft/draftguitools/gui_grid.py
index e5a3d2127d..8c575744f9 100644
--- a/src/Mod/Draft/draftguitools/gui_grid.py
+++ b/src/Mod/Draft/draftguitools/gui_grid.py
@@ -79,10 +79,10 @@ class ToggleGrid(gui_base.GuiCommandSimplest):
             if cmdactive:
                 grid.show_during_command = False
         elif cmdactive:
-            grid.on()
+            grid.set()  # set() required: the grid must be updated to match the current WP
             grid.show_during_command = True
         else:
-            grid.on()
+            grid.set()
             WorkingPlane.get_working_plane()
             grid.show_always = True