diff --git a/app/gui/oven_control/oven.cpp b/app/gui/oven_control/oven.cpp
index ac48f1d..2693355 100644
--- a/app/gui/oven_control/oven.cpp
+++ b/app/gui/oven_control/oven.cpp
@@ -395,8 +395,8 @@ void Oven::stopCooking()
 
 void Oven::startPreheating()
 {
-    if (preheatingStartable())
-    {
+//    if (preheatingStartable())
+//    {
         if (cooking())
             stopCooking();
 
@@ -404,7 +404,7 @@ void Oven::startPreheating()
         interface->startPreheating();
 
         emit changed(this);
-    }
+//    }
 }
 
 void Oven::stopPreheating()
@@ -882,7 +882,7 @@ void Oven::onDoorClosed()
 
     emit changed(this);
 
-    if (!cooldown() && paused())
+    if (!cooldown() && !preheating() && paused())
         startCooking();
 
     if (damper())
diff --git a/app/gui/oven_control/preheatpopup.cpp b/app/gui/oven_control/preheatpopup.cpp
index 6660c41..8865cfc 100644
--- a/app/gui/oven_control/preheatpopup.cpp
+++ b/app/gui/oven_control/preheatpopup.cpp
@@ -28,6 +28,8 @@ PreheatPopup::PreheatPopup(QWidget *parent, Oven *oven) :
     ui->preheatGauge->setMinimum(oven->currentTemp());
     ui->preheatGauge->setValue(oven->currentTemp());
 
+    updateView();
+
     start();
 }
 
@@ -38,7 +40,7 @@ PreheatPopup::~PreheatPopup()
 
 void PreheatPopup::updateView()
 {
-    ui->timeLabel->setText(Stringer::remainingTime(oven->time(), Stringer::fontSize14));
+    ui->timeLabel->setText(Stringer::remainingTime(oven->msecs(), Stringer::fontSize14));
 
     int curInterTemp = oven->currentInterTemp();
     if (oven->interTempEnabled())