diff --git a/app/gui/oven_control/autocookwindow.cpp b/app/gui/oven_control/autocookwindow.cpp
index ffd8d30..7ee4385 100644
--- a/app/gui/oven_control/autocookwindow.cpp
+++ b/app/gui/oven_control/autocookwindow.cpp
@@ -320,6 +320,14 @@ void AutoCookWindow::updateView()
             ui->preheatGauge->hide();
     }
 
+    if (selectedStepIndex != autocook.currentStepIndex)
+    {
+        if (!returnToCurrentStepTimer.isActive())
+        {
+            selectedStepIndex = autocook.currentStepIndex;
+        }
+    }
+
     if (selectedStepIndex != lastViewStepIndex)
     {
         lastViewStepIndex = selectedStepIndex;
@@ -667,22 +675,22 @@ void AutoCookWindow::on_backButton_clicked()
 
 void AutoCookWindow::on_showPrevStepButton_clicked()
 {
+    returnToCurrentStepTimer.start();
+
     if (selectedStepIndex > 0)
     {
         selectedStepIndex--;
         updateView();
     }
-
-    returnToCurrentStepTimer.start();
 }
 
 void AutoCookWindow::on_showNextStepButton_clicked()
 {
+    returnToCurrentStepTimer.start();
+
     if (selectedStepIndex + 1 < autocook.cook.steps.size())
     {
         selectedStepIndex++;
         updateView();
     }
-
-    returnToCurrentStepTimer.start();
 }