diff --git a/frappe/public/js/frappe/form/controls/markdown_editor.js b/frappe/public/js/frappe/form/controls/markdown_editor.js
index ee00fef0f7..81e47a0924 100644
--- a/frappe/public/js/frappe/form/controls/markdown_editor.js
+++ b/frappe/public/js/frappe/form/controls/markdown_editor.js
@@ -6,6 +6,8 @@ frappe.ui.form.ControlMarkdownEditor = frappe.ui.form.ControlCode.extend({
 		this.ace_editor_target.wrap(`<div class="${this.editor_class}-container">`);
 		this.markdown_container = this.$input_wrapper.find(`.${this.editor_class}-container`);
 
+		this.editor.getSession().setUseWrapMode(true);
+
 		this.showing_preview = false;
 		this.preview_toggle_btn = $(`<button class="btn btn-default btn-xs ${this.editor_class}-toggle">${__('Preview')}</button>`)
 			.click(e => {