diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b0acdc0..4ff6f12 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,4 @@
+v.1.0136: Added Confirmation Dialogs to the Grbl Settings reset buttons
 v.1.0136: Added Door and Buttons to Troubleshooting, Added G28/G30 handling, Added Custom machine profile, added Machine Overlay in 3D viewer, added Goto OpenBuilds Button
 v1.0.135: Handle XPROv4 DriverMinder/Grbl-feedhold-resume-abort buttons, add G20/G91 to GOTOZERO moves
 v1.0.134: Added mPOS gotozero, and wPOS GotoZero via mPos Z0
diff --git a/app/index.html b/app/index.html
index 7366549..3ec4b51 100644
--- a/app/index.html
+++ b/app/index.html
@@ -78,19 +78,19 @@
             </div>
             <div class="group">
               <div class="ribbon-group">
-                <button class="ribbon-icon-button" onclick="sendGcode('$RST=$'); refreshGrblSettings()">
+                <button class="ribbon-icon-button" onclick="clearSettings();">
                   <span class="icon">
                     <i class="fas fa-sliders-h"></i>
                   </span>
                   <span class="caption">Reset&nbsp;Settings</span>
                 </button><br>
-                <button class="ribbon-icon-button" onclick="sendGcode('$RST=#'); refreshGrblSettings()">
+                <button class="ribbon-icon-button" onclick="clearWCO();">
                   <span class="icon">
                     <i class="fas fa-layer-group"></i>
                   </span>
                   <span class="caption">Reset&nbsp;WCOs</span>
                 </button><br>
-                <button class="ribbon-icon-button" onclick="sendGcode('$RST=*'); refreshGrblSettings()">
+                <button class="ribbon-icon-button" onclick="clearEEPROM();">
                   <span class="icon">
                     <i class="fas fa-microchip"></i>
                   </span>
diff --git a/app/js/grblsettings.js b/app/js/grblsettings.js
index 6fc1644..e89b9f8 100644
--- a/app/js/grblsettings.js
+++ b/app/js/grblsettings.js
@@ -505,4 +505,97 @@ function displayDirInvert() {
   $('#ydirinvert:checkbox').prop('checked', dir.y);
   $('#zdirinvert:checkbox').prop('checked', dir.z);
   checkifchanged();
+}
+
+// <div class="ribbon-group">
+//   <button class="ribbon-icon-button" onclick="sendGcode('$RST=$'); refreshGrblSettings()">
+//     <span class="icon">
+//       <i class="fas fa-sliders-h"></i>
+//     </span>
+//     <span class="caption">Reset&nbsp;Settings</span>
+//   </button><br>
+//   <button class="ribbon-icon-button" onclick="sendGcode('$RST=#'); refreshGrblSettings()">
+//     <span class="icon">
+//       <i class="fas fa-layer-group"></i>
+//     </span>
+//     <span class="caption">Reset&nbsp;WCOs</span>
+//   </button><br>
+//   <button class="ribbon-icon-button" onclick="sendGcode('$RST=*'); refreshGrblSettings()">
+//     <span class="icon">
+//       <i class="fas fa-microchip"></i>
+//     </span>
+//     <span class="caption">Reset&nbsp;EEPROM</span>
+//   </button>
+// </div>
+
+clearWCO
+clearSettings
+
+function clearSettings() {
+  Metro.dialog.create({
+    title: "Are you sure?",
+    content: "<div>Resetting the Grbl Settings will restore all the settings to factory defaults, but will keep other EEPROM settings intact. Would you like to continue?</div>",
+    actions: [{
+        caption: "Yes",
+        cls: "js-dialog-close secondary",
+        onclick: function() {
+          sendGcode('$RST=$');
+          refreshGrblSettings()
+        }
+      },
+      {
+        caption: "Cancel",
+        cls: "js-dialog-close",
+        onclick: function() {
+          refreshGrblSettings();
+        }
+      }
+    ]
+  });
+}
+
+function clearWCO() {
+  Metro.dialog.create({
+    title: "Are you sure?",
+    content: "<div>Resetting the Work Coordinate Systems will erase all the coordinate system offsets currently stored in the EEPROM on the controller. Would you like to continue?</div>",
+    actions: [{
+        caption: "Yes",
+        cls: "js-dialog-close secondary",
+        onclick: function() {
+          sendGcode('$RST=#');
+          refreshGrblSettings()
+        }
+      },
+      {
+        caption: "Cancel",
+        cls: "js-dialog-close",
+        onclick: function() {
+          refreshGrblSettings();
+        }
+      }
+    ]
+  });
+}
+
+function clearEEPROM() {
+  Metro.dialog.create({
+    title: "Are you sure?",
+    content: "<div>Resetting the EEPROM will erase all the Grbl Firmware settings from your controller, effectively resetting it back to factory defaults. Would you like to continue?</div>",
+    actions: [{
+        caption: "Yes",
+        cls: "js-dialog-close secondary",
+        onclick: function() {
+          sendGcode('$RST=*');
+          refreshGrblSettings()
+        }
+      },
+      {
+        caption: "Cancel",
+        cls: "js-dialog-close",
+        onclick: function() {
+          refreshGrblSettings();
+        }
+      }
+    ]
+  });
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 9360336..db89d4d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "OpenBuildsCONTROL",
-  "version": "1.0.136",
+  "version": "1.0.137",
   "license": "AGPL-3.0",
   "description": "Machine Interface Driver for OpenBuilds",
   "author": "github.com/openbuilds <webmaster@openbuilds.com>",