diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h
index d92a37b42..9cbff1a5c 100644
--- a/Firmware/Configuration.h
+++ b/Firmware/Configuration.h
@@ -5,7 +5,7 @@
 #include "Configuration_prusa.h"
 
 // Firmware version
-#define FW_version "3.0.10-3"
+#define FW_version "3.0.10-4"
 
 #define FW_PRUSA3D_MAGIC "PRUSA3DFW"
 #define FW_PRUSA3D_MAGIC_LEN 10
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 9e2f84166..ea1455230 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2681,9 +2681,17 @@ char reset_menu() {
 }
 
 static void lcd_disable_farm_mode() {
-	farm_mode = 0;
-	eeprom_update_byte((unsigned char *)EEPROM_FARM_MODE, farm_mode);
-	lcd_return_to_status();	
+	int8_t disable = lcd_show_fullscreen_message_yes_no_and_wait_P(PSTR("Disable farm mode?"), true, false); //allow timeouting, default no
+	if (disable) {
+		farm_mode = 0;
+		eeprom_update_byte((unsigned char *)EEPROM_FARM_MODE, farm_mode);
+	}
+	else {
+		lcd_goto_menu(lcd_settings_menu);
+	}
+	lcd_update_enable(true);
+	lcdDrawUpdate = 2;
+	
 }