diff --git a/CHANGES.md b/CHANGES.md
index 4a05df7f6..7d40bba9e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -75,6 +75,7 @@
 - Fix view mode header buttons overlapping in small resolutions [Taiga #5058](https://tree.taiga.io/project/penpot/issue/5058)
 - Fix precision for wrap in flex [Taiga #5072](https://tree.taiga.io/project/penpot/issue/5072)
 - Fix relative position overlay positioning [Taiga #5092](https://tree.taiga.io/project/penpot/issue/5092)
+- Fix hide grid keyboard shortcut [Github #3071](https://github.com/penpot/penpot/pull/3071)
 
 ### :heart: Community contributions by (Thank you!)
 - To @ondrejkonec: for contributing to the code with:
diff --git a/frontend/src/app/main/data/shortcuts_impl.js b/frontend/src/app/main/data/shortcuts_impl.js
index a6c709533..d72137ed0 100644
--- a/frontend/src/app/main/data/shortcuts_impl.js
+++ b/frontend/src/app/main/data/shortcuts_impl.js
@@ -9,6 +9,12 @@
 
 import Mousetrap from 'mousetrap'
 
+if (Mousetrap.addKeycodes) {
+  Mousetrap.addKeycodes({
+    219: '219'
+  });
+}
+
 const target = Mousetrap.prototype || Mousetrap;
 target.stopCallback = function(e, element, combo) {
   // if the element has the class "mousetrap" then no need to stop
diff --git a/frontend/src/app/main/data/workspace/shortcuts.cljs b/frontend/src/app/main/data/workspace/shortcuts.cljs
index 795dfee48..5ec6448e1 100644
--- a/frontend/src/app/main/data/workspace/shortcuts.cljs
+++ b/frontend/src/app/main/data/workspace/shortcuts.cljs
@@ -354,12 +354,14 @@
                           :fn #(st/emit! (dw/select-all))}
 
    :toggle-grid          {:tooltip (ds/meta "'")
-                          :command (ds/c-mod "'")
+                          ;;https://github.com/ccampbell/mousetrap/issues/85                          
+                          :command [(ds/c-mod "'") (ds/c-mod "219")]
                           :subsections [:main-menu]
                           :fn #(st/emit! (toggle-layout-flag :display-grid))}
 
    :toggle-snap-grid     {:tooltip (ds/meta-shift "'")
-                          :command (ds/c-mod "shift+'")
+                          ;;https://github.com/ccampbell/mousetrap/issues/85
+                          :command [(ds/c-mod "shift+'") (ds/c-mod "shift+219")]
                           :subsections [:main-menu]
                           :fn #(st/emit! (toggle-layout-flag :snap-grid))}