diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cpp
index 05d3ee4..9062271 100644
--- a/toonz/sources/toonz/sceneviewerevents.cpp
+++ b/toonz/sources/toonz/sceneviewerevents.cpp
@@ -1436,6 +1436,7 @@ void SceneViewer::keyPressEvent(QKeyEvent *event) {
       if (m_isStyleShortcutSwitchable &&
           Preferences::instance()->isUseNumpadForSwitchingStylesEnabled() &&
           (event->modifiers() == Qt::NoModifier ||
+           event->modifiers() == Qt::ShiftModifier ||
            event->modifiers() == Qt::KeypadModifier) &&
           ((Qt::Key_0 <= key && key <= Qt::Key_9) || key == Qt::Key_Tab ||
            key == Qt::Key_Backtab)) {
diff --git a/toonz/sources/toonz/styleshortcutswitchablepanel.cpp b/toonz/sources/toonz/styleshortcutswitchablepanel.cpp
index 5e77f31..dbdcfdd 100644
--- a/toonz/sources/toonz/styleshortcutswitchablepanel.cpp
+++ b/toonz/sources/toonz/styleshortcutswitchablepanel.cpp
@@ -26,11 +26,11 @@ void StyleShortcutSwitchablePanel::onKeyPress(QKeyEvent *event) {
   TTool *tool = TApp::instance()->getCurrentTool()->getTool();
   if (!tool) return;
   if (tool->getName() == T_Type && tool->isActive()) return;
-  if (event->modifiers() != Qt::NoModifier &&
-      event->modifiers() != Qt::KeypadModifier)
-    return;
   int key = event->key();
   if (Qt::Key_0 <= key && key <= Qt::Key_9) {
+    if (event->modifiers() != Qt::NoModifier &&
+        event->modifiers() != Qt::KeypadModifier)
+      return;
     TPaletteHandle *ph =
         TApp::instance()->getPaletteController()->getCurrentLevelPalette();
 
@@ -46,6 +46,9 @@ void StyleShortcutSwitchablePanel::onKeyPress(QKeyEvent *event) {
     }
     event->accept();
   } else if (key == Qt::Key_Tab || key == Qt::Key_Backtab) {
+    if (event->modifiers() != Qt::NoModifier &&
+        event->modifiers() != Qt::ShiftModifier)
+      return;
     TPaletteHandle *ph =
         TApp::instance()->getPaletteController()->getCurrentLevelPalette();