diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp
index 166fb19..5cf9399 100644
--- a/app/gui/oven_control/manualcookwindow.cpp
+++ b/app/gui/oven_control/manualcookwindow.cpp
@@ -666,9 +666,12 @@ void ManualCookWindow::onOvenUpdated(Oven *oven)
             emit done();
 
             if (oven->mode() != Define::CombiMode) {
+                focused = focusWidget();
+
                 ManualCookFinishPopup *p = new ManualCookFinishPopup(this);
                 p->showFullScreen();
                 connect(p, SIGNAL(keepWarm()), SLOT(startKeepWarm()));
+                connect(p, SIGNAL(destroyed()), SLOT(focusAgain()));
             }
         }
     }