diff --git a/public/res/fileMgr.js b/public/res/fileMgr.js
index 35265fbe..ac46af2c 100644
--- a/public/res/fileMgr.js
+++ b/public/res/fileMgr.js
@@ -1,209 +1,219 @@
 define([
-    "jquery",
-    "underscore",
-    "constants",
-    "core",
-    "utils",
-    "storage",
-    "settings",
-    "eventMgr",
-    "fileSystem",
-    "classes/FileDescriptor",
-    "text!WELCOME.md"
+	"jquery",
+	"underscore",
+	"constants",
+	"core",
+	"utils",
+	"storage",
+	"settings",
+	"eventMgr",
+	"fileSystem",
+	"classes/FileDescriptor",
+	"text!WELCOME.md"
 ], function($, _, constants, core, utils, storage, settings, eventMgr, fileSystem, FileDescriptor, welcomeContent) {
 
-    var fileMgr = {};
+	var fileMgr = {};
 
-    // Defines the current file
-    fileMgr.currentFile = undefined;
+	// Defines the current file
+	fileMgr.currentFile = undefined;
 
-    // Set the current file and refresh the editor
-    fileMgr.selectFile = function(fileDesc) {
-        fileDesc = fileDesc || fileMgr.currentFile;
+	// Set the current file and refresh the editor
+	fileMgr.selectFile = function(fileDesc) {
+		fileDesc = fileDesc || fileMgr.currentFile;
 
-        if(fileDesc === undefined) {
-            var fileSystemSize = _.size(fileSystem);
-            if(fileSystemSize === 0) {
-                // If fileSystem empty create one file
-                fileDesc = fileMgr.createFile(constants.WELCOME_DOCUMENT_TITLE, welcomeContent);
-            }
-            else {
-                // Select the last selected file
-                fileDesc = _.max(fileSystem, function(fileDesc) {
-                    return fileDesc.selectTime || 0;
-                });
-            }
-        }
+		if(fileDesc === undefined) {
+			var fileSystemSize = _.size(fileSystem);
+			if(fileSystemSize === 0) {
+				// If fileSystem empty create one file
+				fileDesc = fileMgr.createFile(constants.WELCOME_DOCUMENT_TITLE, welcomeContent);
+			}
+			else {
+				// Select the last selected file
+				fileDesc = _.max(fileSystem, function(fileDesc) {
+					return fileDesc.selectTime || 0;
+				});
+			}
+		}
 
-        if(fileMgr.currentFile !== fileDesc) {
-            fileMgr.currentFile = fileDesc;
-            fileDesc.selectTime = new Date().getTime();
+		if(fileMgr.currentFile !== fileDesc) {
+			fileMgr.currentFile = fileDesc;
+			fileDesc.selectTime = new Date().getTime();
 
-            // Notify extensions
-            eventMgr.onFileSelected(fileDesc);
+			// Notify extensions
+			eventMgr.onFileSelected(fileDesc);
 
-            // Hide the viewer pencil button
-            $(".action-edit-document").toggleClass("hide", fileDesc.fileIndex != constants.TEMPORARY_FILE_INDEX);
-        }
+			// Hide the viewer pencil button
+			$(".action-edit-document").toggleClass("hide", fileDesc.fileIndex != constants.TEMPORARY_FILE_INDEX);
+		}
 
-        // Refresh the editor (even if it's the same file)
-        core.initEditor(fileDesc);
-    };
+		// Refresh the editor (even if it's the same file)
+		core.initEditor(fileDesc);
+	};
 
-    fileMgr.createFile = function(title, content, discussionListJSON, syncLocations, isTemporary) {
-        content = content !== undefined ? content : settings.defaultContent;
-        if(!title) {
-            // Create a file title
-            title = constants.DEFAULT_FILE_TITLE;
-            var indicator = 2;
-            var checkTitle = function (fileDesc) {
-                return fileDesc.title == title;
-            };
-            while (_.some(fileSystem, checkTitle)) {
-                title = constants.DEFAULT_FILE_TITLE + indicator++;
-            }
-        }
+	fileMgr.createFile = function(title, content, discussionListJSON, syncLocations, isTemporary) {
+		content = content !== undefined ? content : settings.defaultContent;
+		if(!title) {
+			// Create a file title
+			title = constants.DEFAULT_FILE_TITLE;
+			var indicator = 2;
+			var checkTitle = function(fileDesc) {
+				return fileDesc.title == title;
+			};
+			while(_.some(fileSystem, checkTitle)) {
+				title = constants.DEFAULT_FILE_TITLE + indicator++;
+			}
+		}
 
-        // Generate a unique fileIndex
-        var fileIndex = constants.TEMPORARY_FILE_INDEX;
-        if(!isTemporary) {
-            do {
-                fileIndex = "file." + utils.randomString();
-            } while (_.has(fileSystem, fileIndex));
-        }
+		// Generate a unique fileIndex
+		var fileIndex = constants.TEMPORARY_FILE_INDEX;
+		if(!isTemporary) {
+			do {
+				fileIndex = "file." + utils.randomString();
+			} while(_.has(fileSystem, fileIndex));
+		}
 
-        // syncIndex associations
-        syncLocations = syncLocations || {};
-        var sync = _.reduce(syncLocations, function(sync, syncAttributes) {
-            utils.storeAttributes(syncAttributes);
-            return sync + syncAttributes.syncIndex + ";";
-        }, ";");
+		// syncIndex associations
+		syncLocations = syncLocations || {};
+		var sync = _.reduce(syncLocations, function(sync, syncAttributes) {
+			utils.storeAttributes(syncAttributes);
+			return sync + syncAttributes.syncIndex + ";";
+		}, ";");
 
-        storage[fileIndex + ".title"] = title;
-        storage[fileIndex + ".content"] = content;
-        storage[fileIndex + ".sync"] = sync;
-        storage[fileIndex + ".publish"] = ";";
+		storage[fileIndex + ".title"] = title;
+		storage[fileIndex + ".content"] = content;
+		storage[fileIndex + ".sync"] = sync;
+		storage[fileIndex + ".publish"] = ";";
 
-        // Create the file descriptor
-        var fileDesc = new FileDescriptor(fileIndex, title, syncLocations);
-        discussionListJSON && (fileDesc.discussionListJSON = discussionListJSON);
+		// Create the file descriptor
+		var fileDesc = new FileDescriptor(fileIndex, title, syncLocations);
+		discussionListJSON && (fileDesc.discussionListJSON = discussionListJSON);
 
-        // Add the index to the file list
-        if(!isTemporary) {
-            utils.appendIndexToArray("file.list", fileIndex);
-            fileSystem[fileIndex] = fileDesc;
-            eventMgr.onFileCreated(fileDesc);
-        }
-        return fileDesc;
-    };
+		// Add the index to the file list
+		if(!isTemporary) {
+			utils.appendIndexToArray("file.list", fileIndex);
+			fileSystem[fileIndex] = fileDesc;
+			eventMgr.onFileCreated(fileDesc);
+		}
+		return fileDesc;
+	};
 
-    fileMgr.deleteFile = function(fileDesc) {
-        fileDesc = fileDesc || fileMgr.currentFile;
+	fileMgr.deleteFile = function(fileDesc) {
+		fileDesc = fileDesc || fileMgr.currentFile;
 
-        // Unassociate file from folder
-        if(fileDesc.folder) {
-            fileDesc.folder.removeFile(fileDesc);
-            eventMgr.onFoldersChanged();
-        }
+		// Unassociate file from folder
+		if(fileDesc.folder) {
+			fileDesc.folder.removeFile(fileDesc);
+			eventMgr.onFoldersChanged();
+		}
 
-        // Remove the index from the file list
-        utils.removeIndexFromArray("file.list", fileDesc.fileIndex);
-        delete fileSystem[fileDesc.fileIndex];
+		// Remove the index from the file list
+		utils.removeIndexFromArray("file.list", fileDesc.fileIndex);
+		delete fileSystem[fileDesc.fileIndex];
 
-        // Don't bother with fields in localStorage, they will be removed on next page load
+		// Don't bother with fields in localStorage, they will be removed on next page load
 
-        if(fileMgr.currentFile === fileDesc) {
-            // Unset the current fileDesc
-            fileMgr.currentFile = undefined;
-            // Refresh the editor with another file
-            fileMgr.selectFile();
-        }
+		if(fileMgr.currentFile === fileDesc) {
+			// Unset the current fileDesc
+			fileMgr.currentFile = undefined;
+			// Refresh the editor with another file
+			fileMgr.selectFile();
+		}
 
-        eventMgr.onFileDeleted(fileDesc);
-    };
+		eventMgr.onFileDeleted(fileDesc);
+	};
 
-    // Get the file descriptor associated to a syncIndex
-    fileMgr.getFileFromSyncIndex = function(syncIndex) {
-        return _.find(fileSystem, function(fileDesc) {
-            return _.has(fileDesc.syncLocations, syncIndex);
-        });
-    };
+	// Get the file descriptor associated to a syncIndex
+	fileMgr.getFileFromSyncIndex = function(syncIndex) {
+		return _.find(fileSystem, function(fileDesc) {
+			return _.has(fileDesc.syncLocations, syncIndex);
+		});
+	};
 
-    // Get the file descriptor associated to a publishIndex
-    fileMgr.getFileFromPublishIndex = function(publishIndex) {
-        return _.find(fileSystem, function(fileDesc) {
-            return _.has(fileDesc.publishLocations, publishIndex);
-        });
-    };
+	// Get the file descriptor associated to a publishIndex
+	fileMgr.getFileFromPublishIndex = function(publishIndex) {
+		return _.find(fileSystem, function(fileDesc) {
+			return _.has(fileDesc.publishLocations, publishIndex);
+		});
+	};
 
-    eventMgr.addListener("onReady", function() {
-        var $editorElt = $("#wmd-input");
-        fileMgr.selectFile();
+	eventMgr.addListener("onReady", function() {
+		var $editorElt = $("#wmd-input");
+		fileMgr.selectFile();
 
-        var $fileTitleElt = $('.file-title-navbar');
-        var $fileTitleInputElt = $(".input-file-title");
-        $(".action-create-file").click(function() {
-            setTimeout(function() {
-                var fileDesc = fileMgr.createFile();
-                fileMgr.selectFile(fileDesc);
-                $fileTitleElt.click();
-            }, 400);
-        });
-        $('.action-remove-file-confirm').click(function() {
-            $('.modal-remove-file-confirm').modal('show');
-        });
-        $(".action-remove-file").click(function() {
-            fileMgr.deleteFile();
-        });
-        $fileTitleElt.click(function() {
-            if(window.viewerMode === true) {
-                return;
-            }
-            $fileTitleElt.addClass('hide');
-            var fileTitleInput = $fileTitleInputElt.removeClass('hide');
-            setTimeout(function() {
-                fileTitleInput.focus().get(0).select();
-            }, 10);
-        });
-        function applyTitle() {
-            $fileTitleInputElt.addClass('hide');
-            $fileTitleElt.removeClass('hide');
-            var title = $.trim($fileTitleInputElt.val());
-            var fileDesc = fileMgr.currentFile;
-            if(title && title != fileDesc.title) {
-                fileDesc.title = title;
-                eventMgr.onTitleChanged(fileDesc);
-            }
-            $fileTitleInputElt.val(fileDesc.title);
-            $editorElt.focus();
-        }
-        $fileTitleInputElt.blur(function() {
-            applyTitle();
-        }).keyup(function(e) {
-            if(e.keyCode == 13) {
-                applyTitle();
-            }
-            if(e.keyCode == 27) {
-                $fileTitleInputElt.val("");
-                applyTitle();
-            }
-        });
-        $(".action-open-stackedit").click(function() {
-            window.location.href = "editor";
-        });
-        $(".action-edit-document").click(function() {
-            var content = $editorElt.val();
-            var title = fileMgr.currentFile.title;
-            var fileDesc = fileMgr.createFile(title, content);
-            fileMgr.selectFile(fileDesc);
-            window.location.href = "editor";
-        });
-        $(".action-welcome-file").click(function() {
-            var fileDesc = fileMgr.createFile(constants.WELCOME_DOCUMENT_TITLE, welcomeContent);
-            fileMgr.selectFile(fileDesc);
-        });
-    });
+		var $fileTitleElt = $('.file-title-navbar');
+		var $fileTitleInputElt = $(".input-file-title");
+		$(".action-create-file").click(function() {
+			setTimeout(function() {
+				var fileDesc = fileMgr.createFile();
+				fileMgr.selectFile(fileDesc);
+				$fileTitleElt.click();
+			}, 400);
+		});
+		$('.action-remove-file-confirm').click(function() {
+			$('.modal-remove-file-confirm').modal('show');
+		});
+		$(".action-remove-file").click(function() {
+			fileMgr.deleteFile();
+		});
+		var titleEditing;
+		$fileTitleElt.click(function() {
+			if(window.viewerMode === true) {
+				return;
+			}
+			$fileTitleElt.addClass('hide');
+			var fileTitleInput = $fileTitleInputElt.removeClass('hide');
+			titleEditing = true;
+			setTimeout(function() {
+				fileTitleInput.focus().get(0).select();
+			}, 10);
+		});
+		function applyTitle() {
+			if(!titleEditing) {
+				return;
+			}
+			$fileTitleInputElt.addClass('hide');
+			$fileTitleElt.removeClass('hide');
+			var title = $.trim($fileTitleInputElt.val());
+			var fileDesc = fileMgr.currentFile;
+			if(title && title != fileDesc.title) {
+				fileDesc.title = title;
+				eventMgr.onTitleChanged(fileDesc);
+			}
+			$fileTitleInputElt.val(fileDesc.title);
+			$editorElt.focus();
+			titleEditing = false;
+		}
 
-    eventMgr.onFileMgrCreated(fileMgr);
-    return fileMgr;
+		$fileTitleInputElt.blur(function() {
+			setTimeout(function() {
+				applyTitle();
+			}, 0);
+		}).keypress(function(e) {
+			if(e.keyCode == 13) {
+				applyTitle();
+				e.preventDefault();
+			}
+			if(e.keyCode == 27) {
+				$fileTitleInputElt.val("");
+				applyTitle();
+			}
+		});
+		$(".action-open-stackedit").click(function() {
+			window.location.href = "editor";
+		});
+		$(".action-edit-document").click(function() {
+			var content = $editorElt.val();
+			var title = fileMgr.currentFile.title;
+			var fileDesc = fileMgr.createFile(title, content);
+			fileMgr.selectFile(fileDesc);
+			window.location.href = "editor";
+		});
+		$(".action-welcome-file").click(function() {
+			var fileDesc = fileMgr.createFile(constants.WELCOME_DOCUMENT_TITLE, welcomeContent);
+			fileMgr.selectFile(fileDesc);
+		});
+	});
+
+	eventMgr.onFileMgrCreated(fileMgr);
+	return fileMgr;
 });