diff --git a/stuff/profiles/layouts/rooms/Default/menubar_template.xml b/stuff/profiles/layouts/rooms/Default/menubar_template.xml
index 1898a36..3f4404b 100644
--- a/stuff/profiles/layouts/rooms/Default/menubar_template.xml
+++ b/stuff/profiles/layouts/rooms/Default/menubar_template.xml
@@ -230,6 +230,8 @@
         <separator/>
         <command>MI_PrevDrawing</command>
         <command>MI_NextDrawing</command>
+        <command>MI_PrevKeyframe</command>
+        <command>MI_NextKeyframe</command>
         <separator/>
         <command>MI_Link</command>
     </menu>
diff --git a/toonz/sources/toonz/menubar.cpp b/toonz/sources/toonz/menubar.cpp
index cc8d616..1275172 100644
--- a/toonz/sources/toonz/menubar.cpp
+++ b/toonz/sources/toonz/menubar.cpp
@@ -1332,8 +1332,10 @@ QMenuBar *StackedMenuBar::createFullMenuBar() {
   addMenuItem(playMenu, MI_PrevStep);
   addMenuItem(playMenu, MI_NextStep);
   playMenu->addSeparator();
-  addMenuItem(playMenu, MI_NextDrawing);
   addMenuItem(playMenu, MI_PrevDrawing);
+  addMenuItem(playMenu, MI_NextDrawing);
+  addMenuItem(playMenu, MI_PrevKeyframe);
+  addMenuItem(playMenu, MI_NextKeyframe);
   playMenu->addSeparator();
   addMenuItem(playMenu, MI_Link);
 
diff --git a/toonz/sources/toonz/vcrcommand.cpp b/toonz/sources/toonz/vcrcommand.cpp
index 00b70c6..63f3ccf 100644
--- a/toonz/sources/toonz/vcrcommand.cpp
+++ b/toonz/sources/toonz/vcrcommand.cpp
@@ -141,7 +141,8 @@ public:
                                  "FunctionEditor", "FxSettings",
                                  "ComboViewer",    "SceneViewer"};
 
-    QWidget *panel = QApplication::focusWidget();
+    QWidget *panel    = QApplication::focusWidget();
+    if (!panel) panel = TApp::instance()->getActiveViewer();
     while (panel) {
       QString pane = panel->objectName();
       if (panel->windowType() == Qt::WindowType::SubWindow ||
@@ -169,7 +170,8 @@ public:
                                  "FunctionEditor", "FxSettings",
                                  "ComboViewer",    "SceneViewer"};
 
-    QWidget *panel = QApplication::focusWidget();
+    QWidget *panel    = QApplication::focusWidget();
+    if (!panel) panel = TApp::instance()->getActiveViewer();
     while (panel) {
       QString pane = panel->objectName();
       if (panel->windowType() == Qt::WindowType::SubWindow ||