diff --git a/src/main/resources/assets/admin/common/js/ui/toolbar/Toolbar.ts b/src/main/resources/assets/admin/common/js/ui/toolbar/Toolbar.ts
index 5d4b17ef7..29ed3fd6a 100644
--- a/src/main/resources/assets/admin/common/js/ui/toolbar/Toolbar.ts
+++ b/src/main/resources/assets/admin/common/js/ui/toolbar/Toolbar.ts
@@ -126,6 +126,9 @@ export class Toolbar<C extends ToolbarConfig>
         do {
             focusIndex++;
             if (focusIndex === limit) {
+                if (currentFocusIndex === -1) {
+                    return -1;
+                }
                 focusIndex = 0;
             }
         } while (focusIndex !== currentFocusIndex && !this.isElementFocusable(this.toolbarElements[focusIndex]));