diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 4917db3bf..7a298b476 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -205,12 +205,33 @@ export default class CodeEditor extends React.Component {
         // Do nothing
       },
       [translateHotkey(hotkey.insertDate)]: function (cm) {
+        const dateNow = new Date()
+        if (self.props.dateFormatISO8601) {
+          cm.replaceSelection(dateNow.toISOString().split('T')[0])
+        } else {
+          cm.replaceSelection(dateNow.toLocaleDateString())
+        }
+      },
+      'Cmd-/': function (cm) {
+        if (global.process.platform !== 'darwin') { return }
         const dateNow = new Date()
         cm.replaceSelection(dateNow.toLocaleDateString())
       },
-      [translateHotkey(hotkey.insertDateTime)]: function (cm) {
+      'Shift-Ctrl-/': function (cm) {
+        if (global.process.platform === 'darwin') { return }
         const dateNow = new Date()
-        cm.replaceSelection(dateNow.toLocaleString())
+        if (self.props.dateFormatISO8601) {
+          cm.replaceSelection(dateNow.toISOString())
+        } else {
+          cm.replaceSelection(dateNow.toLocaleString())
+        }
+      },
+      'Shift-Cmd-/': function (cm) {
+        if (global.process.platform !== 'darwin') { return }
+        [translateHotkey(hotkey.insertDateTime)]: function (cm) {
+          const dateNow = new Date()
+          cm.replaceSelection(dateNow.toLocaleString())
+        }
       },
       Enter: 'boostNewLineAndIndentContinueMarkdownList',
       'Ctrl-C': cm => {
diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index cd885fd93..dc50e37b4 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -323,6 +323,7 @@ class MarkdownEditor extends React.Component {
           switchPreview={config.editor.switchPreview}
           enableMarkdownLint={config.editor.enableMarkdownLint}
           customMarkdownLintConfig={config.editor.customMarkdownLintConfig}
+          dateFormatISO8601={config.editor.dateFormatISO8601}
           prettierConfig={config.editor.prettierConfig}
           deleteUnusedAttachments={config.editor.deleteUnusedAttachments}
         />
diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js
index f5996c590..1168c284e 100644
--- a/browser/components/MarkdownSplitEditor.js
+++ b/browser/components/MarkdownSplitEditor.js
@@ -182,6 +182,7 @@ class MarkdownSplitEditor extends React.Component {
           switchPreview={config.editor.switchPreview}
           enableMarkdownLint={config.editor.enableMarkdownLint}
           customMarkdownLintConfig={config.editor.customMarkdownLintConfig}
+          dateFormatISO8601={config.editor.dateFormatISO8601}
           deleteUnusedAttachments={config.editor.deleteUnusedAttachments}
        />
         <div styleName='slider' style={{left: this.state.codeEditorWidthInPercent + '%'}} onMouseDown={e => this.handleMouseDown(e)} >
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index ec9a1d0bf..c7cbc78bd 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -768,6 +768,7 @@ class SnippetNoteDetail extends React.Component {
             enableSmartPaste={config.editor.enableSmartPaste}
             hotkey={config.hotkey}
             autoDetect={autoDetect}
+            dateFormatISO8601={config.editor.dateFormatISO8601}
           />
         }
       </div>
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index b753c5159..87a9fcfe3 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -70,6 +70,7 @@ export const DEFAULT_CONFIG = {
     enableSmartPaste: false,
     enableMarkdownLint: false,
     customMarkdownLintConfig: DEFAULT_MARKDOWN_LINT_CONFIG,
+    dateFormatISO8601: false,
     prettierConfig: ` {
       "trailingComma": "es5",
       "tabWidth": 4,
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index 329dbfa42..4e590be64 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -111,6 +111,7 @@ class UiTab extends React.Component {
         enableSmartPaste: this.refs.enableSmartPaste.checked,
         enableMarkdownLint: this.refs.enableMarkdownLint.checked,
         customMarkdownLintConfig: this.customMarkdownLintConfigCM.getCodeMirror().getValue(),
+        dateFormatISO8601: this.refs.dateFormatISO8601.checked,
         prettierConfig: this.prettierConfigCM.getCodeMirror().getValue(),
         deleteUnusedAttachments: this.refs.deleteUnusedAttachments.checked
       },
@@ -629,6 +630,17 @@ class UiTab extends React.Component {
             </label>
           </div>
 
+          <div styleName='group-checkBoxSection'>
+            <label>
+              <input onChange={(e) => this.handleUIChange(e)}
+                checked={this.state.config.editor.dateFormatISO8601}
+                ref='dateFormatISO8601'
+                type='checkbox'
+              />&nbsp;
+              {i18n.__('Date shortcut use iso 8601 format')}
+            </label>
+          </div>
+
           <div styleName='group-section'>
             <div styleName='group-section-label'>
               {i18n.__('Matching character pairs')}