diff --git a/api/src/Vfs/Sharing.php b/api/src/Vfs/Sharing.php
index 87375958ce..4cff8392c6 100644
--- a/api/src/Vfs/Sharing.php
+++ b/api/src/Vfs/Sharing.php
@@ -118,9 +118,12 @@ class Sharing extends \EGroupware\Api\Sharing
 		}
 		if (!$keep_session)	// do NOT change to else, as we might have set $keep_session=false!
 		{
-			// only allow filemanager app
+			// only allow filemanager app & collabora
+			// (In some cases, $GLOBALS['egw_info']['apps'] is not yet set)
+			$apps = $GLOBALS['egw']->acl->get_user_applications($share['share_owner']);
 			$GLOBALS['egw_info']['user']['apps'] = array(
-				'filemanager' => $GLOBALS['egw_info']['apps']['filemanager']
+				'filemanager' => $GLOBALS['egw_info']['apps']['filemanager'] || true,
+				'collabora' => $GLOBALS['egw_info']['apps']['collabora'] || $apps['collabora']
 			);
 
 			$share['share_root'] = '/';
diff --git a/filemanager/inc/class.filemanager_hooks.inc.php b/filemanager/inc/class.filemanager_hooks.inc.php
index cf425e144c..2dfe969648 100644
--- a/filemanager/inc/class.filemanager_hooks.inc.php
+++ b/filemanager/inc/class.filemanager_hooks.inc.php
@@ -304,7 +304,7 @@ class filemanager_hooks
 	 */
 	static function getEditorLink()
 	{
-		foreach (Api\Hooks::process('filemanager-editor-link', 'collabora',true) as $app => $link)
+		foreach (Api\Hooks::process('filemanager-editor-link', 'collabora') as $app => $link)
 		{
 			if ($link && ($access = \EGroupware\Api\Vfs\Links\StreamWrapper::check_app_rights($app)) &&
 				(empty($GLOBALS['egw_info']['user']['preferences']['filemanager']['document_doubleclick_action']) ||