diff --git a/boot/boot.js b/boot/boot.js
index d993499b6..5f64680da 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -1594,6 +1594,8 @@ $tw.Wiki.prototype.processSafeMode = function() {
 	this.addTiddler(new $tw.Tiddler({title: titleReportTiddler, text: report.join("\n\n")}));
 	// Set $:/DefaultTiddlers to point to our report
 	this.addTiddler(new $tw.Tiddler({title: "$:/DefaultTiddlers", text: "[[" + titleReportTiddler + "]]"}));
+	// Switch to the safe mode layout
+	this.addTiddler({title: "$:/layout", text: "$:/core/ui/SafeLayout"});
 };
 
 /*
diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids
index b5e6e2374..e9159e537 100644
--- a/core/language/en-GB/Misc.multids
+++ b/core/language/en-GB/Misc.multids
@@ -58,6 +58,7 @@ Manager/Controls/Show/Option/Tiddlers: tiddlers
 Manager/Controls/Show/Prompt: Show:
 Manager/Controls/Sort/Prompt: Sort by:
 Manager/Item/Colour: Colour
+Manager/Item/Editor: Editor
 Manager/Item/Fields: Fields
 Manager/Item/Icon/None: (none)
 Manager/Item/Icon: Icon
diff --git a/core/modules/startup/story.js b/core/modules/startup/story.js
index 734f6ae76..aad3f3c71 100644
--- a/core/modules/startup/story.js
+++ b/core/modules/startup/story.js
@@ -214,7 +214,7 @@ function updateLocationHash(options) {
 			break;
 	}
 	// Only change the location hash if we must, thus avoiding unnecessary onhashchange events
-	if($tw.utils.getLocationHash() !== $tw.locationHash) {
+	if($tw.utils.getLocationHash() !== $tw.locationHash && !$tw.safeMode) {
 		if(options.updateHistory === "yes") {
 			// Assign the location hash so that history is updated
 			window.location.hash = $tw.locationHash;
diff --git a/core/ui/Manager/ItemMainEditor.tid b/core/ui/Manager/ItemMainEditor.tid
new file mode 100644
index 000000000..80e67519a
--- /dev/null
+++ b/core/ui/Manager/ItemMainEditor.tid
@@ -0,0 +1,5 @@
+title: $:/Manager/ItemMain/Editor
+tags: $:/tags/Manager/ItemMain
+caption: {{$:/language/Manager/Item/Editor}}
+
+<$edit-text tag="textarea" class="tc-edit-texteditor tc-edit-texteditor-body tc-max-width"/>
diff --git a/core/ui/Manager/ItemSidebarTools.tid b/core/ui/Manager/ItemSidebarTools.tid
index 8c46e1d90..2b6ad4a2e 100644
--- a/core/ui/Manager/ItemSidebarTools.tid
+++ b/core/ui/Manager/ItemSidebarTools.tid
@@ -13,3 +13,8 @@ caption: {{$:/language/Manager/Item/Tools}}
 {{$:/core/images/edit-button}}&#32;edit
 </$button>
 </p>
+<p>
+<$button message="tm-delete-tiddler" param=<<currentTiddler>>>
+{{$:/core/images/delete-button}}&#32;delete
+</$button>
+</p>
diff --git a/core/ui/SafeModeLayout.tid b/core/ui/SafeModeLayout.tid
new file mode 100644
index 000000000..af13cc9e3
--- /dev/null
+++ b/core/ui/SafeModeLayout.tid
@@ -0,0 +1,37 @@
+title: $:/core/ui/SafeLayout
+tags: $:/tags/Layout
+name: Safe Mode Layout
+description: Safe Mode Layout
+icon: $:/core/images/list
+
+\whitespace trim
+
+\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+
+\define tv-config-toolbar-class() tc-btn-invisible
+\define tv-config-toolbar-icons() yes
+\define tv-config-toolbar-text() no
+
+<div style="margin: 1em;">
+
+<$navigator story="$:/StoryList" history="$:/HistoryList">
+
+<h2>Layout</h2>
+
+{{$:/snippets/LayoutSwitcher}}
+
+<h2>Controls</h2>
+
+<div class="tc-page-controls">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]">
+<$transclude mode="inline"/>
+</$list>
+</div>
+
+<h2>Tiddlers</h2>
+
+<$transclude tiddler="$:/Manager" mode="block"/>
+
+</$navigator>
+
+</div>
\ No newline at end of file
diff --git a/core/wiki/config/ManagerItemState.multids b/core/wiki/config/ManagerItemState.multids
index 845034ff6..e5cbd6269 100644
--- a/core/wiki/config/ManagerItemState.multids
+++ b/core/wiki/config/ManagerItemState.multids
@@ -1,3 +1,4 @@
 title: $:/state/popup/manager/item/$:/Manager/
 
-ItemMain/RawText: hide
\ No newline at end of file
+ItemMain/RawText: hide
+ItemMain/Editor: hide