diff --git a/changelog.txt b/changelog.txt
index 54517c9..26a86eb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -3,6 +3,7 @@ Version 0.2.6 (2018-)
 - Added menu item to open configurator in new tab (Issue #76) @danielperna84
 - Automatically load last viewed (and not closed) file via localStorage @danielperna84
 - CTRL+s / CMD+s can now be used to save a file @danielperna84
+- Prompting before saving now opt-in in editor settings @danielperna84
 
 Version 0.2.5 (2018-01-27)
 - Added warning-logs for access failure @danielperna84
diff --git a/configurator.py b/configurator.py
index e5b7703..659cc07 100755
--- a/configurator.py
+++ b/configurator.py
@@ -1757,6 +1757,10 @@ INDEX = Template(r"""<!DOCTYPE html>
           <li class="center s12 grey lighten-3 z-depth-1 subheader">Editor Settings</li>
           <div class="row col s12">
               <p class="col s12"> <a class="waves-effect waves-light btn light-blue modal-trigger" href="#modal_acekeyboard">Keyboard Shortcuts</a> </p>
+              <p class="col s12">
+                  <input type="checkbox" class="blue_check" onclick="set_save_prompt(this.checked)" id="savePrompt" />
+                  <Label for="savePrompt">Prompt before save</label>
+              </p>
               <p class="col s12">
                   <input type="checkbox" class="blue_check" onclick="editor.setOption('animatedScroll', !editor.getOptions().animatedScroll)" id="animatedScroll" />
                   <Label for="animatedScroll">Animated Scroll</label>
@@ -2163,10 +2167,11 @@ INDEX = Template(r"""<!DOCTYPE html>
             draggable: true
         });
         listdir('.');
+        document.getElementById('savePrompt').checked = get_save_prompt();
     });
 </script>
 <script type="text/javascript">
-    document.addEventListener("DOMContentLoaded", function(){
+    document.addEventListener("DOMContentLoaded", function() {
         $('.preloader-background').delay(800).fadeOut('slow');
         $('.preloader-wrapper').delay(800).fadeOut('slow');
         if (!localStorage.getItem("new_tab")) {
@@ -2776,7 +2781,12 @@ INDEX = Template(r"""<!DOCTYPE html>
     function save_check() {
         var filepath = document.getElementById('currentfile').value;
         if (filepath.length > 0) {
-            $('#modal_save').modal('open');
+            if (get_save_prompt()) {
+                $('#modal_save').modal('open');
+            }
+            else {
+                save();
+            }
         }
         else {
             Materialize.toast('Error:  Please provide a filename', 5000);
@@ -3083,6 +3093,18 @@ INDEX = Template(r"""<!DOCTYPE html>
         editor.$blockScrolling = Infinity;
     }
 
+    function set_save_prompt(checked) {
+        localStorage.setItem('save_prompt', JSON.stringify({save_prompt: checked}));
+    }
+
+    function get_save_prompt() {
+        if (localStorage.getItem('save_prompt')) {
+            var save_prompt = JSON.parse(localStorage.getItem('save_prompt'));
+            return save_prompt.save_prompt;
+        }
+        return false;
+    }
+
     function apply_settings() {
         var options = editor.getOptions();
         for (var key in options) {
diff --git a/dev.html b/dev.html
index f4354b9..16e23a5 100644
--- a/dev.html
+++ b/dev.html
@@ -1673,6 +1673,10 @@
           <li class="center s12 grey lighten-3 z-depth-1 subheader">Editor Settings</li>
           <div class="row col s12">
               <p class="col s12"> <a class="waves-effect waves-light btn light-blue modal-trigger" href="#modal_acekeyboard">Keyboard Shortcuts</a> </p>
+              <p class="col s12">
+                  <input type="checkbox" class="blue_check" onclick="set_save_prompt(this.checked)" id="savePrompt" />
+                  <Label for="savePrompt">Prompt before save</label>
+              </p>
               <p class="col s12">
                   <input type="checkbox" class="blue_check" onclick="editor.setOption('animatedScroll', !editor.getOptions().animatedScroll)" id="animatedScroll" />
                   <Label for="animatedScroll">Animated Scroll</label>
@@ -2079,10 +2083,11 @@
             draggable: true
         });
         listdir('.');
+        document.getElementById('savePrompt').checked = get_save_prompt();
     });
 </script>
 <script type="text/javascript">
-    document.addEventListener("DOMContentLoaded", function(){
+    document.addEventListener("DOMContentLoaded", function() {
         $('.preloader-background').delay(800).fadeOut('slow');
         $('.preloader-wrapper').delay(800).fadeOut('slow');
         if (!localStorage.getItem("new_tab")) {
@@ -2692,7 +2697,12 @@
     function save_check() {
         var filepath = document.getElementById('currentfile').value;
         if (filepath.length > 0) {
-            $('#modal_save').modal('open');
+            if (get_save_prompt()) {
+                $('#modal_save').modal('open');
+            }
+            else {
+                save();
+            }
         }
         else {
             Materialize.toast('Error:  Please provide a filename', 5000);
@@ -2999,6 +3009,18 @@
         editor.$blockScrolling = Infinity;
     }
 
+    function set_save_prompt(checked) {
+        localStorage.setItem('save_prompt', JSON.stringify({save_prompt: checked}));
+    }
+
+    function get_save_prompt() {
+        if (localStorage.getItem('save_prompt')) {
+            var save_prompt = JSON.parse(localStorage.getItem('save_prompt'));
+            return save_prompt.save_prompt;
+        }
+        return false;
+    }
+
     function apply_settings() {
         var options = editor.getOptions();
         for (var key in options) {
