diff --git a/source/dotnet/Library/AdaptiveCards.Rendering.Wpf/Helpers/SelectActionHelper.cs b/source/dotnet/Library/AdaptiveCards.Rendering.Wpf/Helpers/SelectActionHelper.cs
index bf5cb5ae7c..5b46767f54 100644
--- a/source/dotnet/Library/AdaptiveCards.Rendering.Wpf/Helpers/SelectActionHelper.cs
+++ b/source/dotnet/Library/AdaptiveCards.Rendering.Wpf/Helpers/SelectActionHelper.cs
@@ -20,6 +20,11 @@ public static FrameworkElement RenderSelectAction(this AdaptiveRenderContext con
                     return uiElement;
                 }
 
+                if (selectAction is AdaptiveSubmitAction || selectAction is AdaptiveExecuteAction)
+                {
+                    context.SubmitActionCardId[selectAction] = context.RenderArgs.ContainerCardId;
+                }
+
                 context.IsRenderingSelectAction = true;
                 var uiButton = (Button) context.Render(selectAction);
                 context.IsRenderingSelectAction = false;