diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 6243cf5c..48634993 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -354,7 +354,7 @@ export default class CodeEditor extends React.Component {
       extraKeys: this.defaultKeyMap
     })
 
-    if (!this.props.mode && this.props.value) {
+    if (!this.props.mode && this.props.value && this.props.autoDetect) {
       this.autoDetectLanguage(this.props.value)
     } else {
       this.setMode(this.props.mode)
@@ -982,7 +982,7 @@ export default class CodeEditor extends React.Component {
       }
     }
 
-    if (!this.props.mode) {
+    if (!this.props.mode && this.props.autoDetect) {
       this.autoDetectLanguage(editor.doc.getValue())
     }
   }
@@ -1184,6 +1184,7 @@ CodeEditor.propTypes = {
   onBlur: PropTypes.func,
   onChange: PropTypes.func,
   readOnly: PropTypes.bool,
+  autoDetect: PropTypes.bool,
   spellCheck: PropTypes.bool
 }
 
@@ -1195,5 +1196,6 @@ CodeEditor.defaultProps = {
   fontFamily: 'Monaco, Consolas',
   indentSize: 4,
   indentType: 'space',
+  autoDetect: false,
   spellCheck: false
 }
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 12545335..e9b0ee37 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -674,6 +674,8 @@ class SnippetNoteDetail extends React.Component {
     const storageKey = note.storage
     const folderKey = note.folder
 
+    const autoDetect = config.editor.snippetDefaultLanguage === 'Auto Detect'
+
     let editorFontSize = parseInt(config.editor.fontSize, 10)
     if (!(editorFontSize > 0 && editorFontSize < 101)) editorFontSize = 14
     let editorIndentSize = parseInt(config.editor.indentSize, 10)
@@ -713,7 +715,7 @@ class SnippetNoteDetail extends React.Component {
             storageKey={storageKey}
           />
           : <CodeEditor styleName='tabView-content'
-            mode={snippet.mode}
+            mode={snippet.mode || (autoDetect ? null : config.editor.snippetDefaultLanguage)}
             value={snippet.content}
             linesHighlighted={snippet.linesHighlighted}
             theme={config.editor.theme}
@@ -733,6 +735,7 @@ class SnippetNoteDetail extends React.Component {
             ref={'code-' + index}
             enableSmartPaste={config.editor.enableSmartPaste}
             hotkey={config.hotkey}
+            autoDetect={autoDetect}
           />
         }
       </div>