diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cpp
index fbaea5e..7a7a924 100644
--- a/toonz/sources/toonz/sceneviewerevents.cpp
+++ b/toonz/sources/toonz/sceneviewerevents.cpp
@@ -777,7 +777,8 @@ void SceneViewer::keyPressEvent(QKeyEvent *event) {
   // then consider about shortcut for the current style selection.
   if (m_isStyleShortcutSwitchable &&
       Preferences::instance()->isUseNumpadForSwitchingStylesEnabled() &&
-      (!isTextToolActive) && event->modifiers() == Qt::NoModifier &&
+      (!isTextToolActive) && (event->modifiers() == Qt::NoModifier ||
+                              event->modifiers() == Qt::KeypadModifier) &&
       ((Qt::Key_0 <= key && key <= Qt::Key_9) || key == Qt::Key_Tab ||
        key == Qt::Key_Backtab)) {
     event->ignore();
diff --git a/toonz/sources/toonz/styleshortcutswitchablepanel.cpp b/toonz/sources/toonz/styleshortcutswitchablepanel.cpp
index 4b8ada4..d680521 100644
--- a/toonz/sources/toonz/styleshortcutswitchablepanel.cpp
+++ b/toonz/sources/toonz/styleshortcutswitchablepanel.cpp
@@ -26,7 +26,9 @@ void StyleShortcutSwitchablePanel::keyPressEvent(QKeyEvent *event) {
   TTool *tool = TApp::instance()->getCurrentTool()->getTool();
   if (!tool) return;
   if (tool->getName() == T_Type && tool->isActive()) return;
-  if (event->modifiers() != Qt::NoModifier) return;
+  if (event->modifiers() != Qt::NoModifier &&
+      event->modifiers() != Qt::KeypadModifier)
+    return;
   int key = event->key();
   if (Qt::Key_0 <= key && key <= Qt::Key_9) {
     TPaletteHandle *ph =