diff --git a/js/buttonbehaviors.js b/js/buttonbehaviors.js
index 87a04bd..83691d0 100644
--- a/js/buttonbehaviors.js
+++ b/js/buttonbehaviors.js
@@ -331,6 +331,8 @@ function resetTwist() {
 }
 
 function update() {
+	
+	
 	setState(printer.state,printer.hasControl);
 
 	thermometer.update(printer.temperature, printer.targetTemperature);
@@ -422,6 +424,10 @@ function setState(newState,newHasControl) {
 	} else if(prevState == Printer.DISCONNECTED_STATE && newState == Printer.IDLE_STATE ||
 						prevState == Printer.UNKNOWN_STATE && newState == Printer.IDLE_STATE) {
 		message.set("Printer connected",Message.INFO,true);
+		console.log("  preheat: ",settings["printer.heatup.enabled"]);
+		if(settings["printer.heatup.enabled"]) {
+			printer.preheat();
+		}
 	}	else if(prevState == Printer.PRINTING_STATE && newState == Printer.STOPPING_STATE) {
 		console.log("stopmsg show");
 		message.set("Printer stopping",Message.INFO,false);
diff --git a/js/main.js b/js/main.js
index 2880d7d..757a3da 100644
--- a/js/main.js
+++ b/js/main.js
@@ -164,9 +164,11 @@ function showOrHideThermo() {
 
 function settingsLoaded() {
 	console.log("settingsLoaded");
-	console.log("autoHeatup: ",settings["printer.heatup.enabled"]);
+	
 	if(firstTimeSettingsLoaded) {
-		if(settings["printer.heatup.enabled"]) {
+		console.log("  preheat: ",settings["printer.heatup.enabled"]);
+		console.log("  state: ",state);
+		if(state == Printer.IDLE_STATE && settings["printer.heatup.enabled"]) {
 			printer.preheat();
 		}
 		console.log("doodle3d.tour.enabled: ",settings["doodle3d.tour.enabled"]);