diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp
index 80b22f1..fe8ac60 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp
+++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp
@@ -34,6 +34,7 @@ using namespace Windows::UI::Popups;
 constexpr auto sc_ViewModelPropertyName = L"ViewModel";
 
 GraphingCalculator::GraphingCalculator()
+    : ActiveTracingOn(false)
 {
     Equation::RegisterDependencyProperties();
     Grapher::RegisterDependencyProperties();
@@ -284,7 +285,9 @@ void GraphingCalculator::OnZoomResetCommand(Object ^ /* parameter */)
 
 void GraphingCalculator::OnActiveTracingClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
 {
-    GraphingControl->ActiveTracing = !GraphingControl->ActiveTracing;
+    // The focus change to this button will have turned off the tracing if it was on
+    ActiveTracingOn = !ActiveTracingOn;
+    GraphingControl->ActiveTracing = ActiveTracingOn;
 }
 
 void CalculatorApp::GraphingCalculator::OnGraphLostFocus(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.h b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.h
index 41e0092..1ea90e5 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.h
+++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.h
@@ -57,6 +57,8 @@ namespace CalculatorApp
         void OnActiveTracingClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
         void OnGraphLostFocus(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
         void OnLoosingFocus(Windows::UI::Xaml::UIElement ^ sender, Windows::UI::Xaml::Input::LosingFocusEventArgs ^ args);
+
+        bool ActiveTracingOn;
     };
 
 }