diff --git a/src/Calculator/Controls/OverflowTextBlock.cpp b/src/Calculator/Controls/OverflowTextBlock.cpp
index 7b4adc2f..bdd1727f 100644
--- a/src/Calculator/Controls/OverflowTextBlock.cpp
+++ b/src/Calculator/Controls/OverflowTextBlock.cpp
@@ -197,6 +197,7 @@ void OverflowTextBlock::UpdateScrollButtons()
             m_expressionContainer->Padding = Thickness(left, 0, right, 0);
             m_expressionContent->Margin = Thickness(-left, 0, -right, 0);
             m_expressionContainer->UpdateLayout();
+            m_expressionContainer->Measure(m_expressionContainer->RenderSize);
 
             m_containerViewChangedToken = m_expressionContainer->ViewChanged +=
                 ref new EventHandler<ScrollViewerViewChangedEventArgs ^>(this, &OverflowTextBlock::OnViewChanged);
diff --git a/src/Calculator/Controls/OverflowTextBlock.h b/src/Calculator/Controls/OverflowTextBlock.h
index dd3fe1cb..b4fb2659 100644
--- a/src/Calculator/Controls/OverflowTextBlock.h
+++ b/src/Calculator/Controls/OverflowTextBlock.h
@@ -21,6 +21,13 @@ namespace CalculatorApp
         {
         public:
             OverflowTextBlock()
+                : m_isAccessibilityViewControl(false)
+                , m_ignoreViewChanged(false)
+                , m_expressionContent(nullptr)
+                , m_itemsControl(nullptr)
+                , m_expressionContainer(nullptr)
+                , m_scrollLeft(nullptr)
+                , m_scrollRight(nullptr)
             {
             }
 
@@ -52,6 +59,7 @@ namespace CalculatorApp
             void ScrollRight();
 
             bool m_isAccessibilityViewControl;
+            bool m_ignoreViewChanged;
             Windows::UI::Xaml::FrameworkElement ^ m_expressionContent;
             Windows::UI::Xaml::Controls::ItemsControl ^ m_itemsControl;
             Windows::UI::Xaml::Controls::ScrollViewer ^ m_expressionContainer;