diff --git a/radio/src/thirdparty/libopenui/src/button.cpp b/radio/src/thirdparty/libopenui/src/button.cpp
index 04efafa31..3f2b349db 100644
--- a/radio/src/thirdparty/libopenui/src/button.cpp
+++ b/radio/src/thirdparty/libopenui/src/button.cpp
@@ -38,6 +38,7 @@ void Button::onEvent(event_t event)
 
   if (event == EVT_KEY_BREAK(KEY_ENTER)) {
     if (enabled) {
+      onKeyPress();
       onPress();
     }
   }
@@ -51,6 +52,7 @@ void Button::onEvent(event_t event)
 bool Button::onTouchEnd(coord_t x, coord_t y)
 {
   if (enabled) {
+    onKeyPress();
     if (!(windowFlags & NO_FOCUS)) {
       setFocus(SET_FOCUS_DEFAULT);
     }
diff --git a/radio/src/thirdparty/libopenui/src/modal_window.h b/radio/src/thirdparty/libopenui/src/modal_window.h
index 23367efd2..75fd1b8ff 100644
--- a/radio/src/thirdparty/libopenui/src/modal_window.h
+++ b/radio/src/thirdparty/libopenui/src/modal_window.h
@@ -46,6 +46,7 @@ class ModalWindow: public Window
     bool onTouchEnd(coord_t x, coord_t y) override
     {
       if (!Window::onTouchEnd(x, y) && closeAllowed) {
+        onKeyPress();
         deleteLater();
       }
       return true;