diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index c808892c..b790b375 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -3444,7 +3444,7 @@ void lcd_v2_calibration() {
 void lcd_wizard() {
 	bool result = true;
 	if (calibration_status() != CALIBRATION_STATUS_ASSEMBLED) {
-		result = lcd_show_multiscreen_message_yes_no_and_wait_P(MSG_WIZARD_RERUN, true, false);
+		result = lcd_show_multiscreen_message_yes_no_and_wait_P(MSG_WIZARD_RERUN, false, false);
 	}
 	if (result) {
 		calibration_status_store(CALIBRATION_STATUS_ASSEMBLED);
diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h
index ca1cc16c..5a4a1bf7 100644
--- a/Firmware/ultralcd.h
+++ b/Firmware/ultralcd.h
@@ -83,7 +83,7 @@ void lcd_mylang();
   #define LCD_ALERTMESSAGERPGM(x) lcd_setalertstatuspgm((x))
 
   #define LCD_UPDATE_INTERVAL 100
-  #define LCD_TIMEOUT_TO_STATUS 15000
+  #define LCD_TIMEOUT_TO_STATUS 30000
 
   #ifdef ULTIPANEL
   void lcd_buttons_update();