diff --git a/app/lib/surface/Surface.coffee b/app/lib/surface/Surface.coffee
index feb87fc93..75bc2c7ff 100644
--- a/app/lib/surface/Surface.coffee
+++ b/app/lib/surface/Surface.coffee
@@ -450,6 +450,8 @@ module.exports = Surface = class Surface extends CocoClass
   onToggleGrid: (e) ->
     e?.preventDefault?()
     if @gridShowing() then @hideGrid() else @showGrid()
+    flag = $('#grid-toggle i.icon-ok')
+    flag.toggleClass 'invisible', not @gridShowing()
 
   onSetGrid: (e) ->
     if e.grid then @showGrid() else @hideGrid()
diff --git a/app/templates/play/level/playback.jade b/app/templates/play/level/playback.jade
index 4d00d230f..abcdc942c 100644
--- a/app/templates/play/level/playback.jade
+++ b/app/templates/play/level/playback.jade
@@ -33,7 +33,7 @@ button.btn.btn-xs.btn-inverse#music-button(title="Toggle Music")
     li(title="Ctrl/Cmd + G: Toggle grid display").selectable#grid-toggle
       i.icon-th
       span(data-i18n="play_level.grid") Grid
-      i.icon-ok.secret
+      i.icon-ok.secret.invisible
     li.selectable#edit-wizard-settings
       i.icon-user
       span(data-i18n="play_level.customize_wizard") Customize Wizard