diff --git a/main/displays/calibratedisplay.cpp b/main/displays/calibratedisplay.cpp
index 903b53e..a537308 100644
--- a/main/displays/calibratedisplay.cpp
+++ b/main/displays/calibratedisplay.cpp
@@ -179,33 +179,8 @@ void CalibrateDisplay::rotate(int offset)
         m_selectedButton = 0;
 }
 
-void CalibrateDisplay::back()
-{
-    Base::back();
-
-    switch (m_status)
-    {
-    case Status::Begin:
-        if (m_bootup)
-            espgui::switchScreen<StatusDisplay>();
-        else
-            espgui::switchScreen<BoardcomputerHardwareSettingsMenu>();
-        break;
-    case Status::GasMin:
-    case Status::GasMax:
-    case Status::BremsMin:
-    case Status::BremsMax:
-    case Status::Confirm:
-        m_selectedButton = 0;
-        m_status = Status::Begin;
-        copyFromSettings();
-    }
-}
-
 void CalibrateDisplay::confirm()
 {
-    Base::confirm();
-
     switch (m_selectedButton)
     {
     case 0: // left button pressed
@@ -259,6 +234,27 @@ void CalibrateDisplay::confirm()
     }
 }
 
+void CalibrateDisplay::back()
+{
+    switch (m_status)
+    {
+    case Status::Begin:
+        if (m_bootup)
+            espgui::switchScreen<StatusDisplay>();
+        else
+            espgui::switchScreen<BoardcomputerHardwareSettingsMenu>();
+        break;
+    case Status::GasMin:
+    case Status::GasMax:
+    case Status::BremsMin:
+    case Status::BremsMax:
+    case Status::Confirm:
+        m_selectedButton = 0;
+        m_status = Status::Begin;
+        copyFromSettings();
+    }
+}
+
 void CalibrateDisplay::copyFromSettings()
 {
     m_gasMin = settings.boardcomputerHardware.gasMin;
diff --git a/main/displays/calibratedisplay.h b/main/displays/calibratedisplay.h
index 45b14bd..7846e13 100644
--- a/main/displays/calibratedisplay.h
+++ b/main/displays/calibratedisplay.h
@@ -35,9 +35,8 @@ public:
 
     void rotate(int offset) override;
 
-    void back() override;
-
     void confirm() override;
+    void back() override;
 
 private:
     void copyFromSettings();