diff --git a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
index d2b1526..07daf2a 100644
--- a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
+++ b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
@@ -775,58 +775,88 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp
index 7f981de..9784916 100644
--- a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp
+++ b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp
@@ -149,7 +149,7 @@ void EquationInputArea::FocusEquationTextBox(EquationViewModel ^ equation)
{
return;
}
- auto container = EquationInputList->TryGetElement(index);
+ auto container = EquationInputList->ContainerFromIndex(index);
if (container == nullptr)
{
return;
@@ -234,7 +234,7 @@ void EquationInputArea::EquationTextBox_Loaded(Object ^ sender, RoutedEventArgs
unsigned int index;
if (Equations->IndexOf(copyEquationToFocus, &index))
{
- auto container = EquationInputList->TryGetElement(index);
+ auto container = static_cast(EquationInputList->ContainerFromIndex(index));
if (container != nullptr)
{
container->StartBringIntoView();
@@ -264,7 +264,7 @@ void EquationInputArea::FocusEquationIfNecessary(CalculatorApp::Controls::Equati
unsigned int index;
if (Equations->IndexOf(m_equationToFocus, &index))
{
- auto container = EquationInputList->TryGetElement(index);
+ auto container = static_cast(EquationInputList->ContainerFromIndex(index));
if (container != nullptr)
{
container->StartBringIntoView();