diff --git a/admin/javascript/LeftAndMain.Preview.js b/admin/javascript/LeftAndMain.Preview.js
index d564263c1..1dc12e265 100644
--- a/admin/javascript/LeftAndMain.Preview.js
+++ b/admin/javascript/LeftAndMain.Preview.js
@@ -124,7 +124,7 @@
 			canPreview: function() {
 				var contentEl = this.getLayoutContainer().find('.cms-content');
 				// Only load if we're in the "edit page" view
-				var blockedClasses = ['CMSPagesController', 'CMSSettingsController', 'CMSPageHistoryController'];
+				var blockedClasses = ['CMSPagesController', 'CMSPageHistoryController'];
 				return !(contentEl.is('.' + blockedClasses.join(',.')));
 			},
 			
diff --git a/admin/templates/Includes/CMSSettingsController_SilverStripeNavigator.ss b/admin/templates/Includes/CMSSettingsController_SilverStripeNavigator.ss
new file mode 100644
index 000000000..49fd08a09
--- /dev/null
+++ b/admin/templates/Includes/CMSSettingsController_SilverStripeNavigator.ss
@@ -0,0 +1,5 @@
+<div class="cms-navigator">
+	<a href="#" class="ss-ui-button cms-preview-toggle-link" data-icon="preview">
+		&laquo; <% _t('SilverStripeNavigator.Edit', 'Edit') %>
+	</a>
+</div>
\ No newline at end of file