diff --git a/src/components/Menu/MenuBar.vue b/src/components/Menu/MenuBar.vue
index 3d413030bce..fef9cf34b9d 100644
--- a/src/components/Menu/MenuBar.vue
+++ b/src/components/Menu/MenuBar.vue
@@ -49,7 +49,7 @@
 			@keydown.right.stop="handleToolbarNavigation">
 			<!-- The visible inline actions -->
 			<component :is="actionEntry.component ? actionEntry.component : (actionEntry.children ? 'ActionList' : 'ActionSingle')"
-				v-for="actionEntry, index of visibleEntries"
+				v-for="(actionEntry, index) in visibleEntries"
 				ref="menuEntries"
 				:key="actionEntry.key"
 				:action-entry="actionEntry"
@@ -155,7 +155,7 @@ export default {
 	computed: {
 		visibleEntries() {
 			const list = this.entries.filter(({ priority }) => {
-				// if entry do not have priority, we assume it aways will be visible
+				// if entry has no priority, we assume it always will be visible
 				return priority === undefined || priority <= this.iconsLimit
 			})
 
diff --git a/src/components/Menu/ReadonlyBar.vue b/src/components/Menu/ReadonlyBar.vue
index 90049d450e4..a72c057d0d2 100644
--- a/src/components/Menu/ReadonlyBar.vue
+++ b/src/components/Menu/ReadonlyBar.vue
@@ -5,7 +5,7 @@
 			class="text-readonly-bar__entries"
 			:aria-label="t('text', 'Editor actions')">
 			<component :is="actionEntry.component ? actionEntry.component : (actionEntry.children ? 'ActionList' : 'ActionSingle')"
-				v-for="actionEntry, index of visibleEntries"
+				v-for="(actionEntry, index) in visibleEntries"
 				ref="menuEntries"
 				:key="actionEntry.key"
 				:action-entry="actionEntry"
diff --git a/src/components/Menu/ToolBarLogic.js b/src/components/Menu/ToolBarLogic.js
index f88fc38f12c..6219149efbe 100644
--- a/src/components/Menu/ToolBarLogic.js
+++ b/src/components/Menu/ToolBarLogic.js
@@ -16,7 +16,7 @@ export default defineComponent({
 	watch: {
 		visibleEntries() {
 			this.$nextTick(() => {
-				if (this.activeMenuEntry > this.visibleEntries.length || this.visibleEntries[this.activeMenuEntry].disabled) {
+				if (this.activeMenuEntry > this.visibleEntries.length || this.visibleEntries[this.activeMenuEntry]?.disabled) {
 					this.setNextMenuEntry()
 				}
 			})