diff --git a/radio/src/thirdparty/libopenui/src/form.cpp b/radio/src/thirdparty/libopenui/src/form.cpp
index e36516d52..4a9dd43c8 100644
--- a/radio/src/thirdparty/libopenui/src/form.cpp
+++ b/radio/src/thirdparty/libopenui/src/form.cpp
@@ -188,6 +188,10 @@ void FormGroup::setFocus(uint8_t flag)
         else if (next) {
           next->setFocus(SET_FOCUS_FORWARD);
         }
+        else {
+          clearFocus();
+          focusWindow = this;
+        }
         break;
     }
   }