diff --git a/app/gui/oven_control/manualcookfinishpopup.cpp b/app/gui/oven_control/manualcookfinishpopup.cpp
index d60b9af..362b1d3 100644
--- a/app/gui/oven_control/manualcookfinishpopup.cpp
+++ b/app/gui/oven_control/manualcookfinishpopup.cpp
@@ -5,7 +5,7 @@
 
 #include "soundplayer.h"
 
-ManualCookFinishPopup::ManualCookFinishPopup(QWidget *parent) :
+ManualCookFinishPopup::ManualCookFinishPopup(QWidget *parent, bool keepWarmStartable) :
     QWidget(parent),
     ui(new Ui::ManualCookFinishPopup)
 {
@@ -16,6 +16,8 @@ ManualCookFinishPopup::ManualCookFinishPopup(QWidget *parent) :
     foreach (QPushButton *button, findChildren<QPushButton *>())
         connect(button, &QPushButton::pressed, SoundPlayer::playClick);
 
+    ui->warmupButton->setEnabled(keepWarmStartable);
+
     ui->background->setFocus();
 }
 
diff --git a/app/gui/oven_control/manualcookfinishpopup.h b/app/gui/oven_control/manualcookfinishpopup.h
index 93c094b..d8d8aa6 100644
--- a/app/gui/oven_control/manualcookfinishpopup.h
+++ b/app/gui/oven_control/manualcookfinishpopup.h
@@ -12,7 +12,7 @@ class ManualCookFinishPopup : public QWidget
     Q_OBJECT
 
 public:
-    explicit ManualCookFinishPopup(QWidget *parent = nullptr);
+    explicit ManualCookFinishPopup(QWidget *parent = nullptr, bool keepWarmStartable = true);
     ~ManualCookFinishPopup();
 
 signals:
diff --git a/app/gui/oven_control/manualcookfinishpopup.ui b/app/gui/oven_control/manualcookfinishpopup.ui
index 2dbb80d..fd9621c 100644
--- a/app/gui/oven_control/manualcookfinishpopup.ui
+++ b/app/gui/oven_control/manualcookfinishpopup.ui
@@ -29,6 +29,7 @@ QPushButton[style=&quot;icon&quot;] { background-image: url(:/images/slider_icon
 
 QPushButton { color: white; border: none; }
 QPushButton:pressed, QPushButton:focus { color: yellow; }
+QPushButton:disabled { color: grey; }
 
 QLabel { color: white; }</string>
   </property>
diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp
index 5cf9399..12db865 100644
--- a/app/gui/oven_control/manualcookwindow.cpp
+++ b/app/gui/oven_control/manualcookwindow.cpp
@@ -665,14 +665,12 @@ void ManualCookWindow::onOvenUpdated(Oven *oven)
 
             emit done();
 
-            if (oven->mode() != Define::CombiMode) {
-                focused = focusWidget();
+            focused = focusWidget();
 
-                ManualCookFinishPopup *p = new ManualCookFinishPopup(this);
-                p->showFullScreen();
-                connect(p, SIGNAL(keepWarm()), SLOT(startKeepWarm()));
-                connect(p, SIGNAL(destroyed()), SLOT(focusAgain()));
-            }
+            ManualCookFinishPopup *p = new ManualCookFinishPopup(this, oven->mode() != Define::CombiMode);
+            p->showFullScreen();
+            connect(p, SIGNAL(keepWarm()), SLOT(startKeepWarm()));
+            connect(p, SIGNAL(destroyed()), SLOT(focusAgain()));
         }
     }