diff --git a/radio/src/thirdparty/libopenui/src/menu.cpp b/radio/src/thirdparty/libopenui/src/menu.cpp
index 48ed53f8e..5f508a3a5 100644
--- a/radio/src/thirdparty/libopenui/src/menu.cpp
+++ b/radio/src/thirdparty/libopenui/src/menu.cpp
@@ -369,8 +369,13 @@ void Menu::onEvent(event_t event)
 {
 #if defined(HARDWARE_KEYS)
   if (toolbar &&
-      (event == EVT_KEY_BREAK(KEY_PGDN) || event == EVT_KEY_LONG(KEY_PGDN) ||
-       event == EVT_KEY_BREAK(KEY_PGUP))) {
+      (event == EVT_KEY_BREAK(KEY_PGDN) ||
+#if defined(KEYS_GPIO_REG_PGUP)
+       event == EVT_KEY_BREAK(KEY_PGUP)
+#else
+       event == EVT_KEY_LONG(KEY_PGDN)
+#endif
+       )) {
     toolbar->onEvent(event);
   }
 #endif
diff --git a/radio/src/thirdparty/libopenui/src/menutoolbar.cpp b/radio/src/thirdparty/libopenui/src/menutoolbar.cpp
index 771f2c475..4df30752e 100644
--- a/radio/src/thirdparty/libopenui/src/menutoolbar.cpp
+++ b/radio/src/thirdparty/libopenui/src/menutoolbar.cpp
@@ -83,8 +83,13 @@ void MenuToolbar::onEvent(event_t event)
   
   if (event == EVT_KEY_BREAK(KEY_PGDN)) {
     lv_group_focus_next(group);
-  } else if (event == EVT_KEY_LONG(KEY_PGDN) ||
-             event == EVT_KEY_BREAK(KEY_PGUP)) {
+  }
+#if defined(KEYS_GPIO_REG_PGUP)
+  else if (event == EVT_KEY_BREAK(KEY_PGUP)) {
+#else
+  else if (event == EVT_KEY_LONG(KEY_PGDN)) {
+    killEvents(event);
+#endif
     lv_group_focus_prev(group);
   }