diff --git a/js_src/buttonbehaviors.js b/js_src/buttonbehaviors.js
index 816b899..797bf64 100644
--- a/js_src/buttonbehaviors.js
+++ b/js_src/buttonbehaviors.js
@@ -37,6 +37,7 @@ function initButtonBehavior() {
 
   btnPrevious = $(".btnPrevious");
   btnNext = $(".btnNext");
+  btnSave = $(".btnSave");
 
   //debug
   //btnDebug = $(".debugBtn");
@@ -44,12 +45,6 @@ function initButtonBehavior() {
 	btnNew.on('touchstart mousedown', clearDoodle);
 	btnPrint.on('touchstart mousedown', print);
 
-	// not using these at the moment
-	$("#btnPrevious").css("opacity", "0.3");
-	btnNext.css("opacity", "0.3");
-	$("#btnSave").css("opacity", "0.3");
-//	btnInfo.css("opacity", "0.3");
-
 //  btnClear.click(function(e) {
 //    e.preventDefault();
 //    //      console.log("clear");
@@ -392,6 +387,25 @@ function setState(newState,newHasControl) {
       enableButton(btnSettings, openSettingsWindow);
       break;
   }
+	
+	/* save, next and prev buttons */
+	switch(newState) {
+		/*case Printer.WIFIBOX_DISCONNECTED_STATE:
+			disableButton(btnPrevious);
+			disableButton(btnNext);
+			disableButton(btnSave);
+			break;
+		default:
+			enableButton(btnPrevious, null);
+			enableButton(btnNext, null);
+			enableButton(btnSave, null);
+			break;*/
+		default:
+			disableButton(btnPrevious);
+			disableButton(btnNext);
+			disableButton(btnSave);
+			break;
+	}
 
 	if(newState == Printer.WIFIBOX_DISCONNECTED_STATE) {
 		message.set("Lost connection to WiFi box",Message.ERROR);