diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js
index e6d2fc2c8..26800d2b6 100755
--- a/core/modules/widgets/navigator.js
+++ b/core/modules/widgets/navigator.js
@@ -322,11 +322,10 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 	// Create the new tiddler
 	var baseTitle = (templateTiddler && templateTiddler.fields.title) || "New Tiddler",
 		title;
-	for(var t=0; true; t++) {
-		title = baseTitle + (t ? " " + t : "");
-		if(!this.wiki.tiddlerExists(title)) {
-			break;
-		}
+	var t = 0,
+	    title = baseTitle;
+	while (this.wiki.tiddlerExists(title)) {
+		title = baseTitle + " " + (++t);
 	}
 	var tiddler = new $tw.Tiddler(this.wiki.getCreationFields(),{
 		text: "Newly created tiddler",
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 0d147ea08..f6146930a 100755
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -173,11 +173,11 @@ exports.tiddlerExists = function(title) {
 Generate an unused title from the specified base
 */
 exports.generateNewTitle = function(baseTitle) {
-	var c = 0;
-	do {
-		var title = baseTitle + (c ? " " + (c + 1) : "");
-		c++;
-	} while(this.tiddlerExists(title));
+	var c = 0
+	    title = baseTitle;
+	while(this.tiddlerExists(title) {
+		var title = baseTitle + " " + (++c);
+	};
 	return title;
 };