diff --git a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
index 22e5c9f9..76e095b0 100644
--- a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
+++ b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
@@ -213,7 +213,7 @@ var UI_API_KEY = "{{ uiApiKey }}";
 											</div>
 
 											<div class="row-fluid print-control" style="display: none;" data-bind="visible: loginState.isUser">
-												<button class="btn btn-danger span4" data-bind="click: print, enable: isOperational() && isReady() && !isPrinting() && loginState.isUser(), attr: {title: titlePrintButton}" id="job_print">
+												<button class="btn btn-danger span4" data-bind="click: print_with_safety_glasses_warning, enable: isOperational() && isReady() && !isPrinting() && loginState.isUser(), attr: {title: titlePrintButton}" id="job_print">
 													<i class="icon-white" data-bind="css: {'icon-fire': !isPaused(), 'icon-undo': isPaused(), 'wobble': isPrinting()}"></i> <span data-bind="text: (isPaused() ? '{{ _('Restart') }}' : '{{ _('Laser') }}')">{{ _('Laser') }}</span>
 												</button>
 												<button class="btn span4" id="job_pause" data-bind="click: pause, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser(), css: {active: isPaused()}, attr: {title: titlePauseButton}"><i data-bind="css: {'icon-pause': !isPaused(), 'icon-play': isPaused()}"></i> <span data-bind="visible: !isPaused()">{{ _('Pause') }}</span><span data-bind="visible: isPaused()">{{ _('Resume') }}</span></button>
@@ -389,8 +389,8 @@ var UI_API_KEY = "{{ uiApiKey }}";
 								</ul>
 								<div style="text-align:center">
 								<div class="btn-group" role="group" aria-label="focus mode control" style="">
-									<button id="btn_focus_on" class="btn btn-danger" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendCustomCommand({type:'command',command:'M3S10'}) }">{{ _('Enable Focus') }}</button>
-									<button id="btn_focus_off" class="btn btn-default" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendCustomCommand({type:'command',command:'M5'}) }">{{ _('Disable Focus') }}</button>
+									<button id="btn_focus_on" class="btn btn-danger" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: focus_on ">{{ _('Enable Focus') }}</button>
+									<button id="btn_focus_off" class="btn btn-default" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: focus_off ">{{ _('Disable Focus') }}</button>
 								</div>
 								</div>
 								{% if hasZAxis %}
diff --git a/src/octoprint/static/js/app/viewmodels/control.js b/src/octoprint/static/js/app/viewmodels/control.js
index adad319d..dfaaa422 100644
--- a/src/octoprint/static/js/app/viewmodels/control.js
+++ b/src/octoprint/static/js/app/viewmodels/control.js
@@ -118,6 +118,23 @@ function ControlViewModel(loginStateViewModel, settingsViewModel, printerStateVi
 		}
 	}, this);
 
+	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:'command',command:'M3S10'});
+				});
+		$("#confirmation_dialog").modal("show");
+	};
+	
+	self.focus_off = function(){
+		self.sendCustomCommand({type:'command',command:'M5'});
+	};
+
     self.sendJogCommand = function(axis, multiplier, distance) {
         if (typeof distance === "undefined")
 //            distance = $('#jog_distance button.active').data('distance');
diff --git a/src/octoprint/static/js/app/viewmodels/printerstate.js b/src/octoprint/static/js/app/viewmodels/printerstate.js
index fa0b4a4c..bc8d1678 100644
--- a/src/octoprint/static/js/app/viewmodels/printerstate.js
+++ b/src/octoprint/static/js/app/viewmodels/printerstate.js
@@ -203,6 +203,18 @@ function PrinterStateViewModel(loginStateViewModel) {
         self.busyFiles(busyFiles);
     };
 
+	self.print_with_safety_glasses_warning = function(){
+		$("#confirmation_dialog .confirmation_dialog_message").text(gettext("The laser will now start. 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.print(); 
+					});
+            $("#confirmation_dialog").modal("show");
+	};
+
     self.print = function() {
         var restartCommand = function() {
             self._jobCommand("restart");