1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_region_popover.c b/source/blender/editors/interface/interface_region_popover.c
index 18c31dde66f..43233205877 100644
--- a/source/blender/editors/interface/interface_region_popover.c
+++ b/source/blender/editors/interface/interface_region_popover.c
@@ -203,11 +203,12 @@ static uiBlock *ui_block_func_POPOVER(bContext *C, uiPopupBlockHandle *handle, v
     if (!handle->refresh) {
       uiBut *but = NULL;
       uiBut *but_first = NULL;
-      for (but = block->buttons.first; but; but = but->next) {
-        if ((but_first == NULL) && ui_but_is_editable(but)) {
-          but_first = but;
+      LISTBASE_FOREACH (uiBut *, but_iter, &block->buttons) {
+        if ((but_first == NULL) && ui_but_is_editable(but_iter)) {
+          but_first = but_iter;
         }
-        if (but->flag & (UI_SELECT | UI_SELECT_DRAW)) {
+        if (but_iter->flag & (UI_SELECT | UI_SELECT_DRAW)) {
+          but = but_iter;
           break;
         }
       }