diff --git a/src/parser/classes/NavigationEndpoint.ts b/src/parser/classes/NavigationEndpoint.ts
index 65a1e1f598..6f22ecf4b2 100644
--- a/src/parser/classes/NavigationEndpoint.ts
+++ b/src/parser/classes/NavigationEndpoint.ts
@@ -2,6 +2,7 @@ import { YTNode } from '../helpers.js';
 import { Parser, type IEndpoint, type RawNode } from '../index.js';
 import OpenPopupAction from './actions/OpenPopupAction.js';
 import CreatePlaylistDialog from './CreatePlaylistDialog.js';
+import CommandExecutorCommand from './commands/CommandExecutorCommand.js';
 
 import type Actions from '../../core/Actions.js';
 import type ModalWithTitleAndButton from './ModalWithTitleAndButton.js';
@@ -124,7 +125,12 @@ export default class NavigationEndpoint extends YTNode {
       throw new Error('An API caller must be provided');
 
     if (this.command) {
-      const command = this.command as (YTNode & IEndpoint);
+      let command = this.command as (YTNode & IEndpoint);
+
+      if (command.is(CommandExecutorCommand)) {
+        command = command.commands.at(-1) as (YTNode & IEndpoint);
+      }
+
       return actions.execute(command.getApiPath(), { ...command.buildRequest(), ...args });
     }