diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp
index 636080033..31188a13c 100644
--- a/radio/src/gui/colorlcd/model_select.cpp
+++ b/radio/src/gui/colorlcd/model_select.cpp
@@ -589,11 +589,8 @@ void ModelLabelsWindow::onEvent(event_t event)
     std::set<uint32_t> sellist;
     int select = 0;
     int rowcount = lblselector->getRowCount();
-#if defined(KEYS_GPIO_REG_PGUP)
+
     if (event == EVT_KEY_BREAK(KEY_PGDN)) {
-#else
-    if (event == EVT_KEY_BREAK(KEY_PGDN)) {
-#endif
       if(curSel.size())
         select = (*curSel.rbegin() + 1) % rowcount;
     } else {
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index 6cfab7eeb..804ecd0e6 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit 6cfab7eeb9dbb7cf91c0568e1eb67f5238420808
+Subproject commit 804ecd0e64bf0316493a8e06814474f0cda9557b