diff --git a/radio/src/thirdparty/libopenui/src/menu.cpp b/radio/src/thirdparty/libopenui/src/menu.cpp
index 4bd56205e..965ad4708 100644
--- a/radio/src/thirdparty/libopenui/src/menu.cpp
+++ b/radio/src/thirdparty/libopenui/src/menu.cpp
@@ -49,12 +49,16 @@ void MenuBody::onEvent(event_t event)
         select(0);
       }
       else {
-        lines[selectedIndex].onPress();
         Menu * menu = getParentMenu();
-        if (menu->multiple)
+        if (menu->multiple) {
+          lines[selectedIndex].onPress();
           menu->invalidate();
-        else
+        }
+        else {
+          menu->revertPreviousFocus();
+          lines[selectedIndex].onPress();
           menu->deleteLater();
+        }
       }
     }
   }