diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js
index 152800402..fa54a80d3 100755
--- a/core/modules/widgets/navigator.js
+++ b/core/modules/widgets/navigator.js
@@ -73,7 +73,7 @@ NavigatorWidget.prototype.refresh = function(changedTiddlers) {
 		this.refreshSelf();
 		return true;
 	} else {
-		return this.refreshChildren(changedTiddlers);		
+		return this.refreshChildren(changedTiddlers);
 	}
 };
 
@@ -355,6 +355,9 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
 				if(isRename) {
 					this.wiki.deleteTiddler(draftOf);
 				}
+				// #2381 always remove new title & old
+				this.removeTitleFromStory(storyList,draftTitle);
+				this.removeTitleFromStory(storyList,draftOf);
 				if(!event.paramObject || event.paramObject.suppressNavigation !== "yes") {
 					// Replace the draft in the story with the original
 					this.replaceFirstTitleInStory(storyList,title,draftTitle);
@@ -451,7 +454,7 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 	// Merge the tags
 	var mergedTags = [];
 	if(existingTiddler && existingTiddler.fields.tags) {
-		$tw.utils.pushTop(mergedTags,existingTiddler.fields.tags)
+		$tw.utils.pushTop(mergedTags,existingTiddler.fields.tags);
 	}
 	if(additionalFields && additionalFields.tags) {
 		// Merge tags
@@ -492,7 +495,6 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 
 // Import JSON tiddlers into a pending import tiddler
 NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
-	var self = this;
 	// Get the tiddlers
 	var tiddlers = [];
 	try {
@@ -544,7 +546,7 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 		history.push(IMPORT_TITLE);
 		// Save the updated story and history
 		this.saveStoryList(storyList);
-		this.addToHistory(history);		
+		this.addToHistory(history);
 	}
 	return false;
 };
@@ -577,8 +579,7 @@ NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
 };
 
 NavigatorWidget.prototype.handleFoldTiddlerEvent = function(event) {
-	var self = this,
-		paramObject = event.paramObject || {};
+	var paramObject = event.paramObject || {};
 	if(paramObject.foldedState) {
 		var foldedState = this.wiki.getTiddlerText(paramObject.foldedState,"show") === "show" ? "hide" : "show";
 		this.wiki.setText(paramObject.foldedState,"text",null,foldedState);
@@ -613,8 +614,7 @@ NavigatorWidget.prototype.handleUnfoldAllTiddlersEvent = function(event) {
 };
 
 NavigatorWidget.prototype.handleRenameTiddlerEvent = function(event) {
-	var self = this,
-		paramObject = event.paramObject || {},
+	var paramObject = event.paramObject || {},
 		from = paramObject.from || event.tiddlerTitle,
 		to = paramObject.to;
 	$tw.wiki.renameTiddler(from,to);