diff --git a/radio/src/thirdparty/libopenui/src/form.cpp b/radio/src/thirdparty/libopenui/src/form.cpp
index eea53358c..2bec6e80e 100644
--- a/radio/src/thirdparty/libopenui/src/form.cpp
+++ b/radio/src/thirdparty/libopenui/src/form.cpp
@@ -196,14 +196,14 @@ void FormGroup::setFocus(uint8_t flag)
         else if (next) {
           next->setFocus(SET_FOCUS_FORWARD);
         }
-        else {
+        else if (!(windowFlags & NO_FOCUS)) {
           clearFocus();
           focusWindow = this;
         }
         break;
     }
   }
-  else {
+  else if (!(windowFlags & NO_FOCUS)) {
     FormField::setFocus(flag);
   }
 }