diff --git a/dev/TabView/TabView.cpp b/dev/TabView/TabView.cpp
index ced8432f2a..c26bc15dc8 100755
--- a/dev/TabView/TabView.cpp
+++ b/dev/TabView/TabView.cpp
@@ -1097,11 +1097,11 @@ void TabView::UpdateTabWidths(bool shouldUpdateWidths, bool fillAllAvailableSpac
             {
                 const winrt::Size rightContentSize = rightContentPresenter.DesiredSize();
 
-                if (const auto item = TabStripFooter().try_as<winrt::FrameworkElement>())
+                if (const auto tabStripFooter = TabStripFooter().try_as<winrt::FrameworkElement>())
                 {
-                    const auto minWidth = item.MinWidth();
-                    const auto width = item.Width();
-                    const auto footerWidth = [this,width,minWidth,rightContentSize]() {
+                    const auto minWidth = tabStripFooter.MinWidth();
+                    const auto width = tabStripFooter.Width();
+                    const auto footerWidth = [this, width, minWidth, rightContentSize]() {
                         if (minWidth < width)
                         {
                             return rightContentSize.Width < width ? width : rightContentSize.Width;
diff --git a/dev/TabView/TestUI/TabViewPage.xaml b/dev/TabView/TestUI/TabViewPage.xaml
index 7bf8105e65..fe6c32afb0 100644
--- a/dev/TabView/TestUI/TabViewPage.xaml
+++ b/dev/TabView/TestUI/TabViewPage.xaml
@@ -170,9 +170,6 @@
 
                         <StackPanel x:Name="FirstTabContent" AutomationProperties.Name="FirstTabContent" Background="{ThemeResource TabViewItemHeaderBackgroundSelected}">
                             <Button x:Name="FirstTabButton" AutomationProperties.Name="FirstTabButton" Margin="8" FontSize="20">Home Button</Button>
-                            <Button x:Name="NewWindowTabViewPage" Click="NewWindowTabViewPage_Click">
-                                Open new window TabView page.
-                            </Button>
                             <StackPanel Orientation="Horizontal">
                                 <Button x:Name="TabViewSizingPageButton" AutomationProperties.Name="TabViewSizingPageButton"
                                         Margin="4" Click="TabViewSizingPageButton_Click"
@@ -183,6 +180,8 @@
                                 <Button x:Name="TabViewTabItemsSourcePageButton" AutomationProperties.Name="TabViewTabItemsSourcePageButton"
                                         Margin="4" Click="TabViewTabItemsSourcePageButton_Click"
                                         FontSize="20">TabView TabItemsSource Page</Button>
+                                <Button x:Name="NewWindowTabViewPage" Click="NewWindowTabViewPage_Click">
+                                    Open AppWindowing Page</Button>
                             </StackPanel>
                         </StackPanel>
                     </controls:TabViewItem>
@@ -278,7 +277,7 @@
                         TabStripDragOver="OnTabStripDragOver"
                         TabStripDrop="OnTabStripDrop">
                         <controls:TabView.TabStripFooter>
-                            <Grid x:Name="MinWidthFooter"></Grid>
+                            <Grid x:Name="MinWidthFooter" />
                         </controls:TabView.TabStripFooter>
 
                         <controls:TabView.TabItems>