diff --git a/src/octoprint/static/js/app/viewmodels/control.js b/src/octoprint/static/js/app/viewmodels/control.js
index 6501c017..1320dfbf 100644
--- a/src/octoprint/static/js/app/viewmodels/control.js
+++ b/src/octoprint/static/js/app/viewmodels/control.js
@@ -141,13 +141,14 @@ function ControlViewModel(loginStateViewModel, settingsViewModel, printerStateVi
 				function(e) {
 					e.preventDefault(); 
 					$("#confirmation_dialog").modal("hide"); 
-					self.sendCustomCommand({type:'command',command:'M3S10'});
+					self.sendCustomCommand({type:'commands', commands:['M8', 'M3S7']});
 				});
 		$("#confirmation_dialog").modal("show");
 	};
 	
 	self.focus_off = function(){
-		self.sendCustomCommand({type:'command',command:'M5'});
+//		self.sendCustomCommand({type:'command',command:'M5'});
+		self.sendCustomCommand({type:'commands', commands:['M5', 'M9']});
 	};
 
     self.sendJogCommand = function(axis, multiplier, distance) {