diff --git a/apps/graph/graph/calculation_parameter_controller.cpp b/apps/graph/graph/calculation_parameter_controller.cpp
index 11acb3e45..0c0547300 100644
--- a/apps/graph/graph/calculation_parameter_controller.cpp
+++ b/apps/graph/graph/calculation_parameter_controller.cpp
@@ -34,10 +34,10 @@ bool CalculationParameterController::handleEvent(Ion::Events::Event event) {
     switch(selectedRow()) {
       case 4:
       {
+        m_graphController->setType(GraphView::Type::Tangent);
         StackViewController * stack = (StackViewController *)parentResponder();
         stack->pop();
         stack->pop();
-        m_graphController->setType(GraphView::Type::Tangent);
         stack->push(m_graphController);
         return true;
       }
diff --git a/apps/graph/graph/graph_controller.cpp b/apps/graph/graph/graph_controller.cpp
index c316a081a..6ffa7a135 100644
--- a/apps/graph/graph/graph_controller.cpp
+++ b/apps/graph/graph/graph_controller.cpp
@@ -39,9 +39,10 @@ bool GraphController::handleEvent(Ion::Events::Event event) {
     return FunctionGraphController::handleEvent(event);
   }
   if (type() != GraphView::Type::Default && (event == Ion::Events::Back || event == Ion::Events::OK)) {
-    App * a = static_cast<App *>(app());
-    stackController()->handleEvent(Ion::Events::Back);
+    StackViewController * stack = stackController();
     setType(GraphView::Type::Default);
+    App * a = static_cast<App *>(app());
+    stack->handleEvent(Ion::Events::Back);
     setParentResponder(a->graphControllerParent());
     return true;
   }