diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d52d27df1..5afad8703 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @google/blockly-eng
\ No newline at end of file
+* @RaspberryPiFoundation/blockly-collaborators
diff --git a/core/menu.ts b/core/menu.ts
index 29e5f40aa..924c20b5a 100644
--- a/core/menu.ts
+++ b/core/menu.ts
@@ -280,7 +280,7 @@ export class Menu {
    */
   highlightNext() {
     const index = this.highlightedItem
-      ? this.menuItems.indexOf(this.highlightedItem)
+      ? this.getMenuItems().indexOf(this.highlightedItem)
       : -1;
     this.highlightHelper(index, 1);
   }
@@ -293,7 +293,7 @@ export class Menu {
    */
   highlightPrevious() {
     const index = this.highlightedItem
-      ? this.menuItems.indexOf(this.highlightedItem)
+      ? this.getMenuItems().indexOf(this.highlightedItem)
       : -1;
     this.highlightHelper(index < 0 ? this.menuItems.length : index, -1);
   }