diff --git a/source/uwp/SharedRenderer/lib/AdaptiveTextInputRenderer.cpp b/source/uwp/SharedRenderer/lib/AdaptiveTextInputRenderer.cpp index ba32a4e786..54b53571c3 100644 --- a/source/uwp/SharedRenderer/lib/AdaptiveTextInputRenderer.cpp +++ b/source/uwp/SharedRenderer/lib/AdaptiveTextInputRenderer.cpp @@ -41,8 +41,14 @@ namespace winrt::AdaptiveCards::Rendering::Xaml_Rendering::implementation bool isMultiline = adaptiveTextInput.IsMultiline(); winrt::TextInputStyle style = adaptiveTextInput.TextInputStyle(); isMultiline &= style != winrt::TextInputStyle::Password; - textBoxParentContainer = ::AdaptiveCards::Rendering::Xaml_Rendering::ActionHelpers::HandleInlineAction( + auto textBoxWithInlineAction = ::AdaptiveCards::Rendering::Xaml_Rendering::ActionHelpers::HandleInlineAction( renderContext, renderArgs, inputUIElement, textBoxParentContainer, isMultiline, inlineAction); + + // If the inlineAction is ShowCard, textBoxWithInlineAction will be null and we should not update the parent container + if (textBoxWithInlineAction) + { + textBoxParentContainer = textBoxWithInlineAction; + } } if (!adaptiveTextInput.IsMultiline())