diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js
index 4847371d..918593b1 100644
--- a/js/viewer/viewer.js
+++ b/js/viewer/viewer.js
@@ -66,7 +66,7 @@ var odfViewer = {
 		var viewer;
 		if($('#isPublic').val() === '1') {
 			viewer = OC.generateUrl(
-				'apps/richdocuments/public?shareToken={shareToken}&fileName={fileName}&requesttoken={requesttoken}',
+				'apps/richdocuments/public?shareToken={shareToken}&fileName={fileName}&requesttoken={requesttoken}&dir={dir}',
 				{
 					shareToken: $('#sharingToken').val(),
 					fileName: fileName,
diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
index 62f81c85..74742cc8 100644
--- a/lib/Controller/DocumentController.php
+++ b/lib/Controller/DocumentController.php
@@ -160,7 +160,7 @@ class DocumentController extends Controller {
 	 * @return TemplateResponse
 	 * @throws \Exception
 	 */
-	public function publicPage($shareToken, $fileName) {
+	public function publicPage($shareToken, $fileName, $dir) {
 		try {
 			$share = $this->shareManager->getShareByToken($shareToken);
 			// not authenticated ?
@@ -174,7 +174,7 @@ class DocumentController extends Controller {
 
 			$node = $share->getNode();
 			if($node instanceof Folder) {
-				$item = $node->get($fileName);
+				$item = $node->get($dir.'/'.$fileName);
 			} else {
 				$item = $node;
 			}