diff --git a/js/documents.js b/js/documents.js
index 0945214e..7535a3a2 100644
--- a/js/documents.js
+++ b/js/documents.js
@@ -204,7 +204,7 @@ var documentsMain = {
 				documentsMain.fileId = response.file_id;
 				documentsMain.fileName = documentsMain.getNameByFileid(response.file_id);
 				documentsMain.UI.showEditor(
-						documentsMain.fileName,
+						documentsMain.fileName || response.title,
 						response.permissions & OC.PERMISSION_SHARE && !documentsMain.isGuest
 				);
 				var serverFactory = new ServerFactory();
diff --git a/lib/db/session.php b/lib/db/session.php
index 2717a601..f892859f 100644
--- a/lib/db/session.php
+++ b/lib/db/session.php
@@ -63,6 +63,7 @@ class Db_Session extends \OCA\Documents\Db {
 					->loadBy('file_id', $file->getFileId())
 					->getData()
 		;
+		$session['title'] = basename($path);
 		
 		$memberColor = Helper::getMemberColor($uid);