diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 1abd15a9e..cd73f874a 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -267,7 +267,7 @@ export default class CodeEditor extends React.Component {
       value: this.props.value,
       linesHighlighted: this.props.linesHighlighted,
       lineNumbers: this.props.displayLineNumbers,
-      lineWrapping: true,
+      lineWrapping: this.props.lineWrapping,
       theme: this.props.theme,
       indentUnit: this.props.indentSize,
       tabSize: this.props.indentSize,
@@ -566,6 +566,10 @@ export default class CodeEditor extends React.Component {
       this.editor.setOption('lineNumbers', this.props.displayLineNumbers)
     }
 
+    if (prevProps.lineWrapping !== this.props.lineWrapping) {
+      this.editor.setOption('lineWrapping', this.props.lineWrapping)
+    }
+
     if (prevProps.scrollPastEnd !== this.props.scrollPastEnd) {
       this.editor.setOption('scrollPastEnd', this.props.scrollPastEnd)
     }
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 7503addba..31a28c352 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -518,6 +518,19 @@ class SnippetNoteDetail extends React.Component {
     ])
   }
 
+  handleWrapLineButtonClick (e) {
+    context.popup([
+      {
+        label: 'on',
+        click: (e) => this.handleWrapLineItemClick(e, true)
+      },
+      {
+        label: 'off',
+        click: (e) => this.handleWrapLineItemClick(e, false)
+      }
+    ])
+  }
+
   handleIndentSizeItemClick (e, indentSize) {
     const { config, dispatch } = this.props
     const editor = Object.assign({}, config.editor, {
@@ -550,6 +563,22 @@ class SnippetNoteDetail extends React.Component {
     })
   }
 
+  handleWrapLineItemClick (e, lineWrapping) {
+    const { config, dispatch } = this.props
+    const editor = Object.assign({}, config.editor, {
+      lineWrapping
+    })
+    ConfigManager.set({
+      editor
+    })
+    dispatch({
+      type: 'SET_CONFIG',
+      config: {
+        editor
+      }
+    })
+  }
+
   focus () {
     this.refs.description.focus()
   }
@@ -720,6 +749,7 @@ class SnippetNoteDetail extends React.Component {
             mode={snippet.mode || (autoDetect ? null : config.editor.snippetDefaultLanguage)}
             value={snippet.content}
             linesHighlighted={snippet.linesHighlighted}
+            lineWrapping={config.editor.lineWrapping}
             theme={config.editor.theme}
             fontFamily={config.editor.fontFamily}
             fontSize={editorFontSize}
@@ -899,6 +929,12 @@ class SnippetNoteDetail extends React.Component {
             size: {config.editor.indentSize} 
             <i className='fa fa-caret-down' />
           </button>
+          <button
+            onClick={(e) => this.handleWrapLineButtonClick(e)}
+          >
+            Wrap Line: {config.editor.lineWrapping ? 'on' : 'off'}&nbsp;
+            <i className='fa fa-caret-down' />
+          </button>
         </div>
 
         <StatusBar
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index bea019fa9..ffc4676dd 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -48,6 +48,7 @@ export const DEFAULT_CONFIG = {
     fontFamily: win ? 'Consolas' : 'Monaco',
     indentType: 'space',
     indentSize: '2',
+    lineWrapping: true,
     enableRulers: false,
     rulers: [80, 120],
     displayLineNumbers: true,
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index f74dbda52..ac09fba89 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -91,6 +91,7 @@ class UiTab extends React.Component {
         enableRulers: this.refs.enableEditorRulers.value === 'true',
         rulers: this.refs.editorRulers.value.replace(/[^0-9,]/g, '').split(','),
         displayLineNumbers: this.refs.editorDisplayLineNumbers.checked,
+        lineWrapping: this.refs.editorLineWrapping.checked,
         switchPreview: this.refs.editorSwitchPreview.value,
         keyMap: this.refs.editorKeyMap.value,
         snippetDefaultLanguage: this.refs.editorSnippetDefaultLanguage.value,
@@ -545,6 +546,17 @@ class UiTab extends React.Component {
             </label>
           </div>
 
+          <div styleName='group-checkBoxSection'>
+            <label>
+              <input onChange={(e) => this.handleUIChange(e)}
+                checked={this.state.config.editor.lineWrapping}
+                ref='editorLineWrapping'
+                type='checkbox'
+              />&nbsp;
+              {i18n.__('Wrap line in Snippet Note')}
+            </label>
+          </div>
+
           <div styleName='group-checkBoxSection'>
             <label>
               <input onChange={(e) => this.handleUIChange(e)}
diff --git a/locales/da.json b/locales/da.json
index 79503ab3e..55962cdbd 100644
--- a/locales/da.json
+++ b/locales/da.json
@@ -156,5 +156,6 @@
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/de.json b/locales/de.json
index 518a4e65d..22d0913a1 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -212,5 +212,6 @@
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/en.json b/locales/en.json
index 1e09bfc71..0a8b8780d 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -187,5 +187,6 @@
 	"Snippet Default Language": "Snippet Default Language",
 	"New notes are tagged with the filtering tags": "New notes are tagged with the filtering tags",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/es-ES.json b/locales/es-ES.json
index f80030889..9f1dc19a9 100644
--- a/locales/es-ES.json
+++ b/locales/es-ES.json
@@ -158,5 +158,6 @@
 	"Spellcheck disabled": "Deshabilitar corrector ortográfico",
 	"Show menu bar": "Mostrar barra del menú",
 	"Auto Detect": "Detección automática",
-	"Snippet Default Language": "Lenguaje por defecto de los fragmentos de código"
+	"Snippet Default Language": "Lenguaje por defecto de los fragmentos de código",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/fa.json b/locales/fa.json
index d29e0e750..311fe18d2 100644
--- a/locales/fa.json
+++ b/locales/fa.json
@@ -160,5 +160,6 @@
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/fr.json b/locales/fr.json
index c44b057ed..2e060ec51 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -172,5 +172,6 @@
 	"Snippet name": "Nom du snippet",
 	"Snippet prefix": "Préfixe du snippet",
 	"Delete Note": "Supprimer la note",
-	"New notes are tagged with the filtering tags": "Les nouvelles notes sont taggées avec les tags de filtrage"
+	"New notes are tagged with the filtering tags": "Les nouvelles notes sont taggées avec les tags de filtrage",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/hu.json b/locales/hu.json
index 558770b90..0f6e38328 100644
--- a/locales/hu.json
+++ b/locales/hu.json
@@ -180,5 +180,6 @@
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/it.json b/locales/it.json
index 3b0701970..43bc15fa0 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -160,5 +160,6 @@
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/ja.json b/locales/ja.json
index e1dc553be..b5722795d 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -219,5 +219,6 @@
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ このノートのストレージに存在しない添付ファイルへのリンクを貼り付けました。添付ファイルへのリンクの貼り付けは同一ストレージ内でのみサポートされています。代わりに添付ファイルをドラッグアンドドロップしてください！ ⚠",
 	"Spellcheck disabled": "スペルチェック無効",
 	"Show menu bar": "メニューバーを表示",
-	"Auto Detect": "自動検出"
+	"Auto Detect": "自動検出",
+	"Wrap line in Snippet Note": "行を右端で折り返す（Snippet Note）"
 }
diff --git a/locales/ko.json b/locales/ko.json
index 3dbb1ada5..d762ee152 100644
--- a/locales/ko.json
+++ b/locales/ko.json
@@ -163,5 +163,6 @@
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/no.json b/locales/no.json
index ff8581535..42d17dc3c 100644
--- a/locales/no.json
+++ b/locales/no.json
@@ -156,5 +156,6 @@
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/pl.json b/locales/pl.json
index ffdc14beb..34f053cc9 100644
--- a/locales/pl.json
+++ b/locales/pl.json
@@ -165,5 +165,6 @@
 	"Add tag...": "Dodaj tag...",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/pt-BR.json b/locales/pt-BR.json
index ada02453b..028f9b936 100644
--- a/locales/pt-BR.json
+++ b/locales/pt-BR.json
@@ -156,5 +156,6 @@
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/pt-PT.json b/locales/pt-PT.json
index 159c2255b..739a21814 100644
--- a/locales/pt-PT.json
+++ b/locales/pt-PT.json
@@ -155,5 +155,6 @@
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ Você colou um link referente a um anexo que não pôde ser encontrado no local de armazenamento desta nota. A vinculação de anexos de referência de links só é suportada se o local de origem e de destino for o mesmo de armazenamento. Por favor, arraste e solte o anexo na nota! ⚠",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/ru.json b/locales/ru.json
index 70d140cea..c71f15563 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -153,5 +153,6 @@
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/sq.json b/locales/sq.json
index 33d8ec970..d6104c9b5 100644
--- a/locales/sq.json
+++ b/locales/sq.json
@@ -155,5 +155,6 @@
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/th.json b/locales/th.json
index ade529901..4637f7350 100644
--- a/locales/th.json
+++ b/locales/th.json
@@ -182,5 +182,6 @@
 	"Snippet Default Language": "ทำการ Snippet ภาษาที่เป็นค่าเริ่มต้น",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/tr.json b/locales/tr.json
index d9dd28f15..45cc0cbbc 100644
--- a/locales/tr.json
+++ b/locales/tr.json
@@ -155,5 +155,6 @@
 	"Allow dangerous html tags": "Tehlikeli html etiketlerine izin ver",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 76700a7f1..8b2492453 100755
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -220,5 +220,6 @@
 	"Render newlines in Markdown paragraphs as <br>":"在 Markdown 段落中使用 <br> 换行",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index ec6fa80c9..bdea0f163 100755
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -164,5 +164,6 @@
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
 	"Spellcheck disabled": "Spellcheck disabled",
 	"Show menu bar": "Show menu bar",
-	"Auto Detect": "Auto Detect"
+	"Auto Detect": "Auto Detect",
+	"Wrap line in Snippet Note": "Wrap line in Snippet Note"
 }