diff --git a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
index 599b92ef..dd852ccb 100644
--- a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
+++ b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
@@ -384,7 +384,7 @@
 								<pre id="terminal-output" class="pre-scrollable"></pre>
 								<div class="input-append" style="display: none;" data-bind="visible: loginState.isUser">
 									<input type="text" id="terminal-command" style="width:88%;" data-bind="value: command, event: { keyup: function(d,e) { return handleKeyUp(e); }, keydown: function(d,e) { return handleKeyDown(e); } }, enable: (isOperational() || isLocked()) && loginState.isUser()">
-									<button class="btn" type="button" id="terminal-send" data-bind="click: sendCommand, enable: (isOperational() || isLocked()) && loginState.isUser()">{{ _('Send') }}</button>
+									<button class="btn" type="button" id="terminal-send" data-bind="click: sendCommandWithSafetyPopup, enable: (isOperational() || isLocked()) && loginState.isUser()">{{ _('Send') }}</button>
 								</div>
 							</div>
 
diff --git a/src/octoprint/static/js/app/viewmodels/terminal.js b/src/octoprint/static/js/app/viewmodels/terminal.js
index 24d9d47f..7f725c5b 100644
--- a/src/octoprint/static/js/app/viewmodels/terminal.js
+++ b/src/octoprint/static/js/app/viewmodels/terminal.js
@@ -91,6 +91,33 @@ function TerminalViewModel(loginStateViewModel, settingsViewModel) {
             container.scrollTop(container[0].scrollHeight - container.height())
         }
     };
+	
+	self.sendCommandWithSafetyPopup = function(){
+		var command = self.command().split(' ').join('');
+		if (!command) {
+            return;
+        }
+		
+		console.log(command);
+		var parts = command.match(/^(M3|M03)(S[0-9.]+)?/i);
+		if(parts !== null){
+		
+			$("#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.sendCommand();
+					});
+			$("#confirmation_dialog").modal("show");
+		
+			
+				
+		} else {
+			self.sendCommand();
+		}
+	};
 
     self.sendCommand = function() {
         var command = self.command();
@@ -104,7 +131,7 @@ function TerminalViewModel(loginStateViewModel, settingsViewModel) {
         if (commandMatch != null) {
             command = commandMatch[1].toUpperCase() + ((commandMatch[2] !== undefined) ? commandMatch[2].toUpperCase() : "");
         }
-
+		
         if (command) {
             $.ajax({
                 url: API_BASEURL + "printer/command",
@@ -147,7 +174,7 @@ function TerminalViewModel(loginStateViewModel, settingsViewModel) {
 
     self.handleKeyUp = function(event) {
         if (event.keyCode == 13) {
-            self.sendCommand();
+            self.sendCommandWithSafetyPopup();
         }
 
         // do not prevent default action