diff --git a/web/src/popover_menus.ts b/web/src/popover_menus.ts
index 54e58859bd..6e54e02764 100644
--- a/web/src/popover_menus.ts
+++ b/web/src/popover_menus.ts
@@ -146,7 +146,7 @@ function get_popover_items_for_instance(instance: PopoverInstance): JQuery | und
         return undefined;
     }
 
-    return $current_elem.find("a:visible");
+    return $current_elem.find("a, [tabindex='0']").filter(":visible");
 }
 
 export const default_popover_props: Partial<PopoverProps> = {