diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 1abd15a9..3564fdb8 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -208,7 +208,11 @@ export default class CodeEditor extends React.Component {
       'Ctrl-/': function (cm) {
         if (global.process.platform === 'darwin') { return }
         const dateNow = new Date()
-        cm.replaceSelection(dateNow.toLocaleDateString())
+        if (self.props.dateISO8601) {
+          cm.replaceSelection(dateNow.toISOString().split('T')[0])
+        } else {
+          cm.replaceSelection(dateNow.toLocaleDateString())
+        }
       },
       'Cmd-/': function (cm) {
         if (global.process.platform !== 'darwin') { return }
@@ -218,7 +222,11 @@ export default class CodeEditor extends React.Component {
       'Shift-Ctrl-/': function (cm) {
         if (global.process.platform === 'darwin') { return }
         const dateNow = new Date()
-        cm.replaceSelection(dateNow.toLocaleString())
+        if (self.props.dateISO8601) {
+          cm.replaceSelection(dateNow.toISOString())
+        } else {
+          cm.replaceSelection(dateNow.toLocaleString())
+        }
       },
       'Shift-Cmd-/': function (cm) {
         if (global.process.platform !== 'darwin') { return }
diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index e956655c..e0035535 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -321,6 +321,7 @@ class MarkdownEditor extends React.Component {
           switchPreview={config.editor.switchPreview}
           enableMarkdownLint={config.editor.enableMarkdownLint}
           customMarkdownLintConfig={config.editor.customMarkdownLintConfig}
+          dateISO8601={config.ui.dateFormatISO8601}
         />
         <MarkdownPreview styleName={this.state.status === 'PREVIEW'
             ? 'preview'
diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js
index 2b63d345..0d1f2a90 100644
--- a/browser/components/MarkdownSplitEditor.js
+++ b/browser/components/MarkdownSplitEditor.js
@@ -181,6 +181,7 @@ class MarkdownSplitEditor extends React.Component {
           switchPreview={config.editor.switchPreview}
           enableMarkdownLint={config.editor.enableMarkdownLint}
           customMarkdownLintConfig={config.editor.customMarkdownLintConfig}
+          dateISO8601={config.ui.dateFormatISO8601}
        />
         <div styleName='slider' style={{left: this.state.codeEditorWidthInPercent + '%'}} onMouseDown={e => this.handleMouseDown(e)} >
           <div styleName='slider-hitbox' />
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 7503addb..e8b8b566 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -738,6 +738,7 @@ class SnippetNoteDetail extends React.Component {
             enableSmartPaste={config.editor.enableSmartPaste}
             hotkey={config.hotkey}
             autoDetect={autoDetect}
+            dateISO8601={config.ui.dateFormatISO8601}
           />
         }
       </div>
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index bea019fa..de2c3c61 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -39,7 +39,8 @@ export const DEFAULT_CONFIG = {
     showCopyNotification: true,
     disableDirectWrite: false,
     defaultNote: 'ALWAYS_ASK', // 'ALWAYS_ASK', 'SNIPPET_NOTE', 'MARKDOWN_NOTE'
-    showMenuBar: false
+    showMenuBar: false,
+    dateFormatISO8601: false
   },
   editor: {
     theme: 'base16-light',
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index f74dbda5..c374bf5f 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -78,6 +78,7 @@ class UiTab extends React.Component {
         saveTagsAlphabetically: this.refs.saveTagsAlphabetically.checked,
         enableLiveNoteCounts: this.refs.enableLiveNoteCounts.checked,
         showMenuBar: this.refs.showMenuBar.checked,
+        dateFormatISO8601: this.refs.dateFormatISO8601.checked,
         disableDirectWrite: this.refs.uiD2w != null
           ? this.refs.uiD2w.checked
           : false
@@ -293,7 +294,16 @@ class UiTab extends React.Component {
             </div>
             : null
           }
-
+          <div styleName='group-checkBoxSection'>
+            <label>
+              <input onChange={(e) => this.handleUIChange(e)}
+                checked={this.state.config.ui.dateFormatISO8601}
+                ref='dateFormatISO8601'
+                type='checkbox'
+              />&nbsp;
+              {i18n.__('Date shortcut use iso 8601 format')}
+            </label>
+          </div>
           <div styleName='group-header2'>Tags</div>
 
           <div styleName='group-checkBoxSection'>
diff --git a/package.json b/package.json
index 0893e681..aad1fc3b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "boost",
   "productName": "Boostnote",
-   "version": "0.11.17",
+  "version": "0.11.17",
   "main": "index.js",
   "description": "Boostnote",
   "license": "GPL-3.0",