diff --git a/src/Avalonia.Xaml.Interactions/Core/InvokeCommandAction.cs b/src/Avalonia.Xaml.Interactions/Core/InvokeCommandAction.cs
index 2720133a7..8a82b467d 100644
--- a/src/Avalonia.Xaml.Interactions/Core/InvokeCommandAction.cs
+++ b/src/Avalonia.Xaml.Interactions/Core/InvokeCommandAction.cs
@@ -1,101 +1,10 @@
-using System.Windows.Input;
-using Avalonia.Data.Converters;
-
-namespace Avalonia.Xaml.Interactions.Core;
+namespace Avalonia.Xaml.Interactions.Core;
 
 /// <summary>
 /// Executes a specified <see cref="System.Windows.Input.ICommand"/> when invoked. 
 /// </summary>
-public class InvokeCommandAction : Interactivity.StyledElementAction
+public class InvokeCommandAction : InvokeCommandActionBase
 {
-    /// <summary>
-    /// Identifies the <seealso cref="Command"/> avalonia property.
-    /// </summary>
-    public static readonly StyledProperty<ICommand?> CommandProperty =
-        AvaloniaProperty.Register<InvokeCommandAction, ICommand?>(nameof(Command));
-
-    /// <summary>
-    /// Identifies the <seealso cref="CommandParameter"/> avalonia property.
-    /// </summary>
-    public static readonly StyledProperty<object?> CommandParameterProperty =
-        AvaloniaProperty.Register<InvokeCommandAction, object?>(nameof(CommandParameter));
-
-    /// <summary>
-    /// Identifies the <seealso cref="InputConverter"/> avalonia property.
-    /// </summary>
-    public static readonly StyledProperty<IValueConverter?> InputConverterProperty =
-        AvaloniaProperty.Register<InvokeCommandAction, IValueConverter?>(nameof(InputConverter));
-
-    /// <summary>
-    /// Identifies the <seealso cref="InputConverterParameter"/> avalonia property.
-    /// </summary>
-    public static readonly StyledProperty<object?> InputConverterParameterProperty =
-        AvaloniaProperty.Register<InvokeCommandAction, object?>(nameof(InputConverterParameter));
-
-    /// <summary>
-    /// Identifies the <seealso cref="InputConverterLanguage"/> avalonia property.
-    /// </summary>
-    /// <remarks>The string.Empty used for default value string means the invariant culture.</remarks>
-    public static readonly StyledProperty<string?> InputConverterLanguageProperty =
-        AvaloniaProperty.Register<InvokeCommandAction, string?>(nameof(InputConverterLanguage), string.Empty);
-
-    /// <summary>
-    /// Gets or sets the command this action should invoke. This is an avalonia property.
-    /// </summary>
-    public ICommand? Command
-    {
-        get => GetValue(CommandProperty);
-        set => SetValue(CommandProperty, value);
-    }
-
-    /// <summary>
-    /// Gets or sets the parameter that is passed to <see cref="System.Windows.Input.ICommand.Execute(object)"/>.
-    /// If this is not set, the parameter from the <seealso cref="Execute(object, object)"/> method will be used.
-    /// This is an optional avalonia property.
-    /// </summary>
-    public object? CommandParameter
-    {
-        get => GetValue(CommandParameterProperty);
-        set => SetValue(CommandParameterProperty, value);
-    }
-
-    /// <summary>
-    /// Gets or sets the converter that is run on the parameter from the <seealso cref="Execute(object, object)"/> method.
-    /// This is an optional avalonia property.
-    /// </summary>
-    public IValueConverter? InputConverter
-    {
-        get => GetValue(InputConverterProperty);
-        set => SetValue(InputConverterProperty, value);
-    }
-
-    /// <summary>
-    /// Gets or sets the parameter that is passed to the <see cref="IValueConverter.Convert"/>
-    /// method of <see cref="InputConverter"/>.
-    /// This is an optional avalonia property.
-    /// </summary>
-    public object? InputConverterParameter
-    {
-        get => GetValue(InputConverterParameterProperty);
-        set => SetValue(InputConverterParameterProperty, value);
-    }
-
-    /// <summary>
-    /// Gets or sets the language that is passed to the <see cref="IValueConverter.Convert"/>
-    /// method of <see cref="InputConverter"/>.
-    /// This is an optional avalonia property.
-    /// </summary>
-    public string? InputConverterLanguage
-    {
-        get => GetValue(InputConverterLanguageProperty);
-        set => SetValue(InputConverterLanguageProperty, value);
-    }
-
-    /// <summary>
-    /// Specifies whether the EventArgs of the event that triggered this action should be passed to the Command as a parameter.
-    /// </summary>
-    public bool PassEventArgsToCommand { get; set; }
-
     /// <summary>
     /// Executes the action.
     /// </summary>
@@ -109,29 +18,7 @@ public override object Execute(object? sender, object? parameter)
             return false;
         }
 
-        object? resolvedParameter = default;
-        if (IsSet(CommandParameterProperty))
-        {
-            resolvedParameter = CommandParameter;
-        }
-        else if (InputConverter is not null)
-        {
-            resolvedParameter = InputConverter.Convert(
-                parameter,
-                typeof(object),
-                InputConverterParameter,
-                InputConverterLanguage is not null
-                    ? 
-                    new System.Globalization.CultureInfo(InputConverterLanguage)
-                    : System.Globalization.CultureInfo.CurrentCulture);
-        }
-        else
-        {
-            if (PassEventArgsToCommand)
-            {
-                resolvedParameter = parameter;
-            }
-        }
+        var resolvedParameter = ResolveParameter(parameter);
 
         if (!Command.CanExecute(resolvedParameter))
         {
@@ -139,6 +26,7 @@ InputConverterLanguage is not null
         }
 
         Command.Execute(resolvedParameter);
+
         return true;
     }
 }
diff --git a/src/Avalonia.Xaml.Interactions/Core/InvokeCommandActionBase.cs b/src/Avalonia.Xaml.Interactions/Core/InvokeCommandActionBase.cs
new file mode 100644
index 000000000..01a320abe
--- /dev/null
+++ b/src/Avalonia.Xaml.Interactions/Core/InvokeCommandActionBase.cs
@@ -0,0 +1,133 @@
+using System.Windows.Input;
+using Avalonia.Data.Converters;
+using Avalonia.Xaml.Interactivity;
+
+namespace Avalonia.Xaml.Interactions.Core;
+
+/// <summary>
+/// Command action base class.
+/// </summary>
+public abstract class InvokeCommandActionBase : StyledElementAction
+{
+    /// <summary>
+    /// Identifies the <seealso cref="Command"/> avalonia property.
+    /// </summary>
+    public static readonly StyledProperty<ICommand?> CommandProperty =
+        AvaloniaProperty.Register<InvokeCommandActionBase, ICommand?>(nameof(Command));
+
+    /// <summary>
+    /// Identifies the <seealso cref="CommandParameter"/> avalonia property.
+    /// </summary>
+    public static readonly StyledProperty<object?> CommandParameterProperty =
+        AvaloniaProperty.Register<InvokeCommandActionBase, object?>(nameof(CommandParameter));
+
+    /// <summary>
+    /// Identifies the <seealso cref="InputConverter"/> avalonia property.
+    /// </summary>
+    public static readonly StyledProperty<IValueConverter?> InputConverterProperty =
+        AvaloniaProperty.Register<InvokeCommandActionBase, IValueConverter?>(nameof(InputConverter));
+
+    /// <summary>
+    /// Identifies the <seealso cref="InputConverterParameter"/> avalonia property.
+    /// </summary>
+    public static readonly StyledProperty<object?> InputConverterParameterProperty =
+        AvaloniaProperty.Register<InvokeCommandActionBase, object?>(nameof(InputConverterParameter));
+
+    /// <summary>
+    /// Identifies the <seealso cref="InputConverterLanguage"/> avalonia property.
+    /// </summary>
+    /// <remarks>The string.Empty used for default value string means the invariant culture.</remarks>
+    public static readonly StyledProperty<string?> InputConverterLanguageProperty =
+        AvaloniaProperty.Register<InvokeCommandActionBase, string?>(nameof(InputConverterLanguage), string.Empty);
+
+    /// <summary>
+    /// Gets or sets the command this action should invoke. This is an avalonia property.
+    /// </summary>
+    public ICommand? Command
+    {
+        get => GetValue(CommandProperty);
+        set => SetValue(CommandProperty, value);
+    }
+  
+    /// <summary>
+    /// Gets or sets the parameter that is passed to <see cref="System.Windows.Input.ICommand.Execute(object)"/>.
+    /// If this is not set, the parameter from the <seealso cref="IAction.Execute(object, object)"/> method will be used.
+    /// This is an optional avalonia property.
+    /// </summary>
+    public object? CommandParameter
+    {
+        get => GetValue(CommandParameterProperty);
+        set => SetValue(CommandParameterProperty, value);
+    }
+  
+    /// <summary>
+    /// Gets or sets the converter that is run on the parameter from the <seealso cref="IAction.Execute(object, object)"/> method.
+    /// This is an optional avalonia property.
+    /// </summary>
+    public IValueConverter? InputConverter
+    {
+        get => GetValue(InputConverterProperty);
+        set => SetValue(InputConverterProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the parameter that is passed to the <see cref="IValueConverter.Convert"/>
+    /// method of <see cref="InputConverter"/>.
+    /// This is an optional avalonia property.
+    /// </summary>
+    public object? InputConverterParameter
+    {
+        get => GetValue(InputConverterParameterProperty);
+        set => SetValue(InputConverterParameterProperty, value);
+    }
+    
+    /// <summary>
+    /// Gets or sets the language that is passed to the <see cref="IValueConverter.Convert"/>
+    /// method of <see cref="InputConverter"/>.
+    /// This is an optional avalonia property.
+    /// </summary>
+    public string? InputConverterLanguage
+    {
+        get => GetValue(InputConverterLanguageProperty);
+        set => SetValue(InputConverterLanguageProperty, value);
+    }
+
+    /// <summary>
+    /// Specifies whether the EventArgs of the event that triggered this action should be passed to the Command as a parameter.
+    /// </summary>
+    public bool PassEventArgsToCommand { get; set; }
+
+    /// <summary>
+    /// Resolves the command parameter.
+    /// </summary>
+    /// <param name="parameter">The parameter.</param>
+    /// <returns></returns>
+    protected object? ResolveParameter(object? parameter)
+    {
+        object? resolvedParameter = null;
+        if (IsSet(CommandParameterProperty))
+        {
+            resolvedParameter = CommandParameter;
+        }
+        else if (InputConverter is not null)
+        {
+            resolvedParameter = InputConverter.Convert(
+                parameter,
+                typeof(object),
+                InputConverterParameter,
+                InputConverterLanguage is not null
+                    ? 
+                    new System.Globalization.CultureInfo(InputConverterLanguage)
+                    : System.Globalization.CultureInfo.CurrentCulture);
+        }
+        else
+        {
+            if (PassEventArgsToCommand)
+            {
+                resolvedParameter = parameter;
+            }
+        }
+
+        return resolvedParameter;
+    }
+}