diff --git a/app/assets/javascripts/sitewide/tiny_mce.js b/app/assets/javascripts/sitewide/tiny_mce.js
index 29126aac8..de9c146ff 100644
--- a/app/assets/javascripts/sitewide/tiny_mce.js
+++ b/app/assets/javascripts/sitewide/tiny_mce.js
@@ -65,7 +65,8 @@ var TinyMCE = (function() {
           removed_menuitems: 'newdocument',
           object_resizing: true,
           elementpath: false,
-          forced_root_block: false,
+          forced_root_block: 'div',
+          force_p_newlines: false,
           default_link_target: '_blank',
           target_list: [
             { title: 'New page', value: '_blank' },