diff --git a/plugin/notes/notes.html b/plugin/notes/notes.html
index 0cc8cf61..75f1b9b0 100644
--- a/plugin/notes/notes.html
+++ b/plugin/notes/notes.html
@@ -239,6 +239,7 @@
 					// No need for updating the notes in case of fragment changes
 					if ( data.notes ) {
 						notes.classList.remove( 'hidden' );
+						notesValue.style.whiteSpace = data.whitespace;
 						if( data.markdown ) {
 							notesValue.innerHTML = marked( data.notes );
 						}
diff --git a/plugin/notes/notes.js b/plugin/notes/notes.js
index e42329d2..a0e8021c 100644
--- a/plugin/notes/notes.js
+++ b/plugin/notes/notes.js
@@ -55,12 +55,14 @@ var RevealNotes = (function() {
 				type: 'state',
 				notes: '',
 				markdown: false,
+				whitespace: 'normal',
 				state: Reveal.getState()
 			};
 
 			// Look for notes defined in a slide attribute
 			if( slideElement.hasAttribute( 'data-notes' ) ) {
 				messageData.notes = slideElement.getAttribute( 'data-notes' );
+				messageData.whitespace = 'pre-wrap';
 			}
 
 			// Look for notes defined in an aside element