diff --git a/src/Calculator/Views/Calculator.xaml b/src/Calculator/Views/Calculator.xaml
index b7db10eb..01164b83 100644
--- a/src/Calculator/Views/Calculator.xaml
+++ b/src/Calculator/Views/Calculator.xaml
@@ -515,6 +515,7 @@
                         <Setter Target="M5.MaxWidth" Value="80"/>
                         <Setter Target="memButton.(Grid.Column)" Value="5"/>
                         <Setter Target="MemoryButton.(Grid.Column)" Value="6"/>
+                        <Setter Target="HistoryButton.Visibility" Value="Collapsed"/>
                     </VisualState.Setters>
                     <Storyboard Completed="OnStoryboardCompleted"/>
                 </VisualState>
diff --git a/src/Calculator/Views/Calculator.xaml.cpp b/src/Calculator/Views/Calculator.xaml.cpp
index 10858a30..65b3f45e 100644
--- a/src/Calculator/Views/Calculator.xaml.cpp
+++ b/src/Calculator/Views/Calculator.xaml.cpp
@@ -415,7 +415,7 @@ void Calculator::UpdateHistoryState()
         SetChildAsHistory();
         HistoryButton->Visibility = ::Visibility::Collapsed;
 
-        if (m_IsLastFlyoutHistory)
+        if (!IsProgrammer && m_IsLastFlyoutHistory)
         {
             DockPivot->SelectedIndex = 0;
         }
@@ -522,7 +522,7 @@ void Calculator::HistoryFlyout_Closed(_In_ Object ^sender, _In_ Object ^args)
     AutomationProperties::SetName(HistoryButton, m_openHistoryFlyoutAutomationName);
     m_fIsHistoryFlyoutOpen = false;
     EnableControls(true);
-    if (HistoryButton->IsEnabled)
+    if (HistoryButton->IsEnabled && HistoryButton->Visibility == ::Visibility::Visible)
     {
         HistoryButton->Focus(::FocusState::Programmatic);
     }