diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp
index 6ceb3129..26542d55 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp
+++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp
@@ -635,6 +635,7 @@ void CalculatorApp::GraphingCalculator::ActiveTracing_KeyUp(Windows::UI::Core::C
     if (args->VirtualKey == VirtualKey::Escape)
     {
         GraphingControl->ActiveTracing = false;
+        ActiveTracing->Focus(::FocusState::Programmatic);
         args->Handled = true;
     }
 }