diff --git a/CHANGES.md b/CHANGES.md
index 4e63461ac5..ad5948645b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -46,7 +46,7 @@
 - Add a search bar to filter colors in the color palette toolbar (by @eureka0928) [Github #7653](https://github.com/penpot/penpot/issues/7653)
 - Allow customising the OIDC login button label (by @wdeveloper16) [Github #7027](https://github.com/penpot/penpot/issues/7027)
 - Add page separators in Workspace [Taiga #13611](https://tree.taiga.io/project/penpot/us/13611?milestone=262806)
-
+- Add Shift+Numpad0/1/2 as aliases to Shift+0/1/2 for zoom shortcuts [Github #2457](https://github.com/penpot/penpot/issues/2457)
 
 ### :bug: Bugs fixed
 
diff --git a/frontend/packages/mousetrap/index.js b/frontend/packages/mousetrap/index.js
index 5a0bc3e0bc..12bcbab1b9 100644
--- a/frontend/packages/mousetrap/index.js
+++ b/frontend/packages/mousetrap/index.js
@@ -187,6 +187,14 @@ function _addEvent(object, type, callback) {
  */
 function _characterFromEvent(e) {
 
+  // Numpad digits as "num0".."num9" — keeps them separate from main-row bindings across NumLock states and event types.
+  if (e.code && e.code.indexOf('Numpad') === 0) {
+    var suffix = e.code.substring(6);
+    if (suffix.length === 1 && suffix >= '0' && suffix <= '9') {
+      return 'num' + suffix;
+    }
+  }
+
   // for keypress events we should return the character as is
   if (e.type == 'keypress') {
     var character = String.fromCharCode(e.which);
diff --git a/frontend/src/app/main/data/workspace/shortcuts.cljs b/frontend/src/app/main/data/workspace/shortcuts.cljs
index a89662e8d3..e7ff9a99ed 100644
--- a/frontend/src/app/main/data/workspace/shortcuts.cljs
+++ b/frontend/src/app/main/data/workspace/shortcuts.cljs
@@ -514,17 +514,17 @@
                           :fn #(st/emit! (dw/decrease-zoom))}
 
    :reset-zoom           {:tooltip (ds/shift "0")
-                          :command "shift+0"
+                          :command ["shift+0" "shift+num0"]
                           :subsections [:zoom-workspace]
                           :fn #(st/emit! dw/reset-zoom)}
 
    :fit-all              {:tooltip (ds/shift "1")
-                          :command "shift+1"
+                          :command ["shift+1" "shift+num1"]
                           :subsections [:zoom-workspace]
                           :fn #(st/emit! dw/zoom-to-fit-all)}
 
    :zoom-selected        {:tooltip (ds/shift "2")
-                          :command ["shift+2" "@" "\""]
+                          :command ["shift+2" "shift+num2" "@" "\""]
                           :subsections [:zoom-workspace]
                           :fn #(st/emit! dw/zoom-to-selected-shape)}
 
@@ -626,7 +626,7 @@
             (range 10)
             (map (fn [n] [(keyword (str "opacity-" n))
                           {:tooltip (str n)
-                           :command (str n)
+                           :command [(str n) (str "num" n)]
                            :subsections [:modify-layers]
                            :fn #(emit-when-no-readonly (dwly/pressed-opacity n))}])))))