diff --git a/app/app/components/document/page-wizard.js b/app/app/components/document/page-wizard.js
index 87536103..7c8848da 100644
--- a/app/app/components/document/page-wizard.js
+++ b/app/app/components/document/page-wizard.js
@@ -12,16 +12,20 @@
 import Ember from 'ember';
 import NotifierMixin from '../../mixins/notifier';
 
-const {
-	computed,
-} = Ember;
-
 export default Ember.Component.extend(NotifierMixin, {
 	display: 'section', // which CSS to use
 	hasTemplates: false,
+	hasBlocks: false,
+	blockMode: false,
 
 	didReceiveAttrs() {
 		let blocks = this.get('blocks');
+		let blockMode = is.not.undefined(blocks);
+
+		this.set('blockMode', blockMode);
+		if (!blockMode) {
+			return;
+		}
 
 		this.set('hasBlocks', blocks.get('length') > 0);
 
diff --git a/app/app/pods/document/wizard/template.hbs b/app/app/pods/document/wizard/template.hbs
index a5bc3dfd..37c5e05b 100644
--- a/app/app/pods/document/wizard/template.hbs
+++ b/app/app/pods/document/wizard/template.hbs
@@ -1 +1 @@
-{{document/page-wizard display='tab' document=model.document folder=model.folder sections=model.sections onCancel=(action 'onCancel') onAction=(action 'onAddSection')}}
+{{document/page-wizard display='tab' document=model.document folder=model.folder sections=model.sections onCancel=(action 'onCancel') onAddSection=(action 'onAddSection')}}
diff --git a/app/app/templates/components/document/page-wizard.hbs b/app/app/templates/components/document/page-wizard.hbs
index 2ae1bbdf..b8ace7e1 100644
--- a/app/app/templates/components/document/page-wizard.hbs
+++ b/app/app/templates/components/document/page-wizard.hbs
@@ -19,41 +19,43 @@
 				</li>
 			{{/each}}
 		</ul>
-		{{#if hasBlocks}}
-			<div class="divider"></div>
-			<div class="template-caption">Reusable content</div>
-			<ul class="list">
-				{{#each blocks as |block|}}
-					<li class="item min-height">
-						<div class="icon">
-							<img class="img" src="/assets/img/section-saved.png" srcset="/assets/img/section-saved@2x.png"  {{action 'onInsertBlock' block}}/>
-							<div class="actions">
-								{{#link-to 'document.block' folder.id folder.slug document.id document.slug block.id}}
-									<i class="material-icons">mode_edit</i>
-								{{/link-to}}
-								<i class="material-icons" id={{block.deleteId}}>delete</i>
+		{{#if blockMode}}
+			{{#if hasBlocks}}
+				<div class="divider"></div>
+				<div class="template-caption">Reusable content</div>
+				<ul class="list">
+					{{#each blocks as |block|}}
+						<li class="item min-height">
+							<div class="icon">
+								<img class="img" src="/assets/img/section-saved.png" srcset="/assets/img/section-saved@2x.png"  {{action 'onInsertBlock' block}}/>
+								<div class="actions">
+									{{#link-to 'document.block' folder.id folder.slug document.id document.slug block.id}}
+										<i class="material-icons">mode_edit</i>
+									{{/link-to}}
+									<i class="material-icons" id={{block.deleteId}}>delete</i>
+								</div>
 							</div>
-						</div>
-						<div class="details" {{action 'onInsertBlock' block}}>
-							<div class='title'>
-								{{block.title}}
+							<div class="details" {{action 'onInsertBlock' block}}>
+								<div class='title'>
+									{{block.title}}
+								</div>
+								<div class='desc'>{{block.excerpt}}</div>
+								<div class='desc'>By {{block.firstname}} {{block.lastname}}, {{time-ago block.created}} (used: {{ block.used }})</div>
 							</div>
-							<div class='desc'>{{block.excerpt}}</div>
-							<div class='desc'>By {{block.firstname}} {{block.lastname}}, {{time-ago block.created}} (used: {{ block.used }})</div>
-						</div>
-						<div class="clearfix" />
-						{{#dropdown-dialog target=block.deleteId position="bottom left" button="Delete" color="flat-red" onAction=(action 'onDeleteBlock' block.id)}}
-			                <p>
-								Are you sure you want to delete block<br/>
-								<span class="bold">{{block.title}}?</span>
-							</p>
-			            {{/dropdown-dialog}}
-					</li>
-				{{/each}}
-			</ul>
-		{{else}}
-			<div class="divider"></div>
-			<div class="template-caption">Reusable content appears below</div>
+							<div class="clearfix" />
+							{{#dropdown-dialog target=block.deleteId position="bottom left" button="Delete" color="flat-red" onAction=(action 'onDeleteBlock' block.id)}}
+								<p>
+									Are you sure you want to delete block<br/>
+									<span class="bold">{{block.title}}?</span>
+								</p>
+							{{/dropdown-dialog}}
+						</li>
+					{{/each}}
+				</ul>
+			{{else}}
+				<div class="divider"></div>
+				<div class="template-caption">Reusable content appears below</div>
+			{{/if}}
 		{{/if}}
 	</div>
 </div>