diff --git a/src/octoprint/static/js/app/viewmodels/control.js b/src/octoprint/static/js/app/viewmodels/control.js
index cc142e40..0ff58998 100644
--- a/src/octoprint/static/js/app/viewmodels/control.js
+++ b/src/octoprint/static/js/app/viewmodels/control.js
@@ -207,26 +207,7 @@ $(function() {
 //	
 
 //
-//	self.focus_on = function(){
-//		
-//		$("#confirmation_dialog .confirmation_dialog_message").text(gettext("The laser will now be enabled. Protect yourself and everybody in the room appropriately before proceeding!"));
-//		$("#confirmation_dialog .confirmation_dialog_acknowledge").unbind("click");
-//		$("#confirmation_dialog .confirmation_dialog_acknowledge").click(
-//				function(e) {
-//					e.preventDefault(); 
-//					$("#confirmation_dialog").modal("hide"); 
-//					self.sendCustomCommand({type:'commands', commands:['M8', 'M3S7']});
-//					setTimeout(function(){ // switch focus off after 30 seconds for safety reasons.
-//						self.focus_off();
-//					}, 30000);
-//				});
-//		$("#confirmation_dialog").modal("show");
-//	};
-//	
-//	self.focus_off = function(){
-////		self.sendCustomCommand({type:'command',command:'M5'});
-//		self.sendCustomCommand({type:'commands', commands:['M5', 'M9']});
-//	};
+
 //
 //    self.sendJogCommand = function(axis, multiplier, distance) {
 //        if (typeof distance === "undefined")
@@ -866,13 +847,34 @@ $(function() {
 			self.sendCustomCommand({type: 'command', command: "G92 X0 Y0"});
 		};
 
-		self.jogDistanceInMM = ko.observable(undefined)
+		self.jogDistanceInMM = ko.observable(undefined);
+
+		self.focus_on = function () {
+
+			$("#confirmation_dialog .confirmation_dialog_message").text(gettext("The laser will now be enabled. Protect yourself and everybody in the room appropriately before proceeding!"));
+			$("#confirmation_dialog .confirmation_dialog_acknowledge").unbind("click");
+			$("#confirmation_dialog .confirmation_dialog_acknowledge").click(
+					function (e) {
+						e.preventDefault();
+						$("#confirmation_dialog").modal("hide");
+						self.sendCustomCommand({type: 'commands', commands: ['M8', 'M3S7']});
+						setTimeout(function () { // switch focus off after 30 seconds for safety reasons.
+							self.focus_off();
+						}, 30000);
+					});
+			$("#confirmation_dialog").modal("show");
+		};
+
+		self.focus_off = function () {
+//		self.sendCustomCommand({type:'command',command:'M5'});
+			self.sendCustomCommand({type: 'commands', commands: ['M5', 'M9']});
+		};
 
     }
 
     OCTOPRINT_VIEWMODELS.push([
         ControlViewModel,
         ["loginStateViewModel", "settingsViewModel", 'printerStateViewModel'],
-        "#control"
+        ["#control", '#focus']
     ]);
 });
diff --git a/src/octoprint/templates/mrbeam_index.jinja2 b/src/octoprint/templates/mrbeam_index.jinja2
index 8d1d9d25..7e8f8d9d 100644
--- a/src/octoprint/templates/mrbeam_index.jinja2
+++ b/src/octoprint/templates/mrbeam_index.jinja2
@@ -427,7 +427,7 @@
 									</div>
 
 									<div id="files_search" class="">
-										<form class="form-search">
+										<form class="form-search" data-bind="submit: performSearch">
 											<input type="text" style="width:90%;" class="input-block search-query" data-bind="value: searchQuery, valueUpdate: 'input'" placeholder="{{ _('Search...') }}">
 										</form>
 									</div>