diff --git a/src/Calculator/Calculator.vcxproj.filters b/src/Calculator/Calculator.vcxproj.filters
index f17fe368..91776afc 100644
--- a/src/Calculator/Calculator.vcxproj.filters
+++ b/src/Calculator/Calculator.vcxproj.filters
@@ -308,6 +308,9 @@
     <ClCompile Include="Common\AppLifecycleLogger.cpp">
       <Filter>Common</Filter>
     </ClCompile>
+    <ClCompile Include="Controls\HorizontalNoOverflowStackPanel.cpp">
+      <Filter>Controls</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -407,6 +410,9 @@
     <ClInclude Include="Common\AppLifecycleLogger.h">
       <Filter>Common</Filter>
     </ClInclude>
+    <ClInclude Include="Controls\HorizontalNoOverflowStackPanel.h">
+      <Filter>Controls</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest" />
diff --git a/src/Calculator/Controls/HorizontalNoOverflowStackPanel.cpp b/src/Calculator/Controls/HorizontalNoOverflowStackPanel.cpp
index b03e0eef..8236b6f5 100644
--- a/src/Calculator/Controls/HorizontalNoOverflowStackPanel.cpp
+++ b/src/Calculator/Controls/HorizontalNoOverflowStackPanel.cpp
@@ -55,7 +55,7 @@ Size HorizontalNoOverflowStackPanel::ArrangeOverride(Size finalSize)
         {
             //stack the items horizontally (left to right)
             item->Arrange(Rect(posX, 0, itemWidth, finalSize.Height));
-            posX += item->DesiredSize.Width;
+            posX += item->RenderSize.Width;
         }
         else
         {