diff --git a/src/widgets/bedextruderwidget.h b/src/widgets/bedextruderwidget.h
--- a/src/widgets/bedextruderwidget.h
+++ b/src/widgets/bedextruderwidget.h
@@ -49,6 +49,6 @@
     int extruderCount = 0;
 
 signals:
-    void bedTemperatureChanged(int tmp);
-    void extTemperatureChanged(int tmp, int currExt);
+    void bedTemperatureChanged(int tmp, bool andWait);
+    void extTemperatureChanged(int tmp, int currExt, bool andWait);
 };
diff --git a/src/widgets/bedextruderwidget.cpp b/src/widgets/bedextruderwidget.cpp
--- a/src/widgets/bedextruderwidget.cpp
+++ b/src/widgets/bedextruderwidget.cpp
@@ -33,13 +33,13 @@
 
     connect(ui->bedTempSB, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), [ = ](double tmp) {
         if (ui->heatBedPB->isChecked()) {
-            emit bedTemperatureChanged(tmp);
+            emit bedTemperatureChanged(tmp,ui->bedAndWaitCB->isChecked());
         }
     });
 
     connect(ui->extTempSB, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), [ = ](double tmp) {
         if (ui->heatExtPB->isChecked()) {
-            emit extTemperatureChanged(tmp, currentExtruder());
+            emit extTemperatureChanged(tmp, currentExtruder(),ui->extAndWaitCB->isChecked());
         }
     });
 }
@@ -94,24 +94,24 @@
 
 void BedExtruderWidget::stopHeating()
 {
-    emit bedTemperatureChanged(0);
+    emit bedTemperatureChanged(0,ui->bedAndWaitCB->isChecked());
     for (int i = 0; i < extruderCount; i++) {
-        emit extTemperatureChanged(0, i);
+        emit extTemperatureChanged(0, i,ui->extAndWaitCB->isChecked());
     }
     ui->heatBedPB->setChecked(false);
     ui->heatExtPB->setChecked(false);
 }
 
 void BedExtruderWidget::heatExtruderClicked(bool clicked)
 {
     int temp = ui->extTempSB->value() * clicked;
-    emit extTemperatureChanged(temp, currentExtruder());
+    emit extTemperatureChanged(temp, currentExtruder(),ui->extAndWaitCB->isChecked());
 }
 
 void BedExtruderWidget::heatBedClicked(bool clicked)
 {
     int temp = ui->bedTempSB->value() * clicked;
-    emit bedTemperatureChanged(temp);
+    emit bedTemperatureChanged(temp,ui->bedAndWaitCB->isChecked());
 
 }
 
diff --git a/src/widgets/bedextruderwidget.ui b/src/widgets/bedextruderwidget.ui
--- a/src/widgets/bedextruderwidget.ui
+++ b/src/widgets/bedextruderwidget.ui
@@ -171,6 +171,20 @@
    <item row="6" column="0" colspan="3">
     <layout class="QHBoxLayout" name="extRadioButtonLayout"/>
    </item>
+   <item row="1" column="3">
+    <widget class="QCheckBox" name="bedAndWaitCB">
+     <property name="text">
+      <string>andWait</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="3">
+    <widget class="QCheckBox" name="extAndWaitCB">
+     <property name="text">
+      <string>andWait</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>