diff --git a/app/gui/oven_control/coretempsettingpopup.cpp b/app/gui/oven_control/coretempsettingpopup.cpp
index e6848cc..619ef77 100644
--- a/app/gui/oven_control/coretempsettingpopup.cpp
+++ b/app/gui/oven_control/coretempsettingpopup.cpp
@@ -176,6 +176,8 @@ void CoreTempSettingPopup::focusCoreTempButton()
 {
     if (focusWidget() == ui->coreTempSlider)
         ui->coreTempButton->setFocus();
+
+    updateView();
 }
 
 void CoreTempSettingPopup::updateView()
@@ -186,6 +188,10 @@ void CoreTempSettingPopup::updateView()
     ui->curHumidityLabel->setText(QString::number(oven->currentHumidity()));
     ui->targetHumidityLabel->setText(QString::number(oven->humidity()));
 
+
+    QWidget *focused = focusWidget();
+    ui->coreTempButton->setChecked(focused == ui->coreTempSlider);
+
     switch (temperatureFormat())
     {
     case Fahrenheit:
@@ -216,4 +222,6 @@ void CoreTempSettingPopup::on_coreTempButton_clicked()
 {
     ui->coreTempSlider->setFocus();
     focusCoreTempButtonTimer.start();
+
+    updateView();
 }
diff --git a/app/gui/oven_control/coretempsettingpopup.ui b/app/gui/oven_control/coretempsettingpopup.ui
index 85828b7..6d8a4dd 100644
--- a/app/gui/oven_control/coretempsettingpopup.ui
+++ b/app/gui/oven_control/coretempsettingpopup.ui
@@ -449,6 +449,9 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
 QPushButton:checked { image: url(:/images/slider_icon/core_temp_ov.png); }
 QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_temp_ov.png); }</string>
    </property>
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="style" stdset="0">
     <string>icon</string>
    </property>