diff --git a/api/js/jsapi/app_base.js b/api/js/jsapi/app_base.js
index 78d4c0c08f..c3c415d497 100644
--- a/api/js/jsapi/app_base.js
+++ b/api/js/jsapi/app_base.js
@@ -1890,14 +1890,21 @@ var AppJS = (function(){ "use strict"; return Class.extend(
 		return true;
 	},
 	/**
-	 * create a share-link for the given file or directory
-	 * @param {object} _action egw actions
-	 * @param {object} _senders selected nm row
+	 * create a share-link for the given entry
+	 *
+	 * @param {egwAction} _action egw actions
+	 * @param {egwActionObject[]} _senders selected nm row
+	 * @param {egwActionObject} _target Drag source.  Not used here.
+	 * @param {Boolean} _files Allow access to files from the share.
 	 * @returns {Boolean} returns false if not successful
 	 */
-	share_link: function(_action, _senders){
+	share_link: function(_action, _senders, _target, _files){
 		var path = _senders[0].id;
-		egw.json('filemanager_ui::ajax_action', [_action.id, path],
+		if(typeof _files === 'undefined' && _action.parent && _action.parent.getActionById('shareFiles'))
+		{
+			_files = _action.parent.getActionById('shareFiles').checked || false;
+		}
+		egw.json('EGroupware\\Api\\Sharing::ajax_create', [_action.id, path, _files],
 			this._share_link_callback, this, true, this).sendRequest();
 		return true;
 	},
@@ -1932,7 +1939,7 @@ var AppJS = (function(){ "use strict"; return Class.extend(
 				jQuery("body").off("click", "[name=share_link]", copy_link_to_clipboard);
 				return true;
 			},
-			title: _data.title ? _data.title : egw.lang("%1 Share Link", _data.action ==='shareWritableLink'? "Writable": "Readonly"),
+			title: _data.title ? _data.title : egw.lang("%1 Share Link", _data.action ==='shareWritableLink'? egw.lang("Writable"): egw.lang("Readonly")),
 			template: _data.template,
 			width: 450,
 			value: {content:{ "share_link": _data.share_link }}
diff --git a/api/src/Sharing.php b/api/src/Sharing.php
index c0d39ddef7..99a622a474 100644
--- a/api/src/Sharing.php
+++ b/api/src/Sharing.php
@@ -494,6 +494,32 @@ class Sharing
 		return $share;
 	}
 
+	/**
+	 * Create a share via AJAX
+	 *
+	 * @param String $action
+	 * @param String $path
+	 * @param boolean $files
+	 */
+	public static function ajax_create($action, $path, $files)
+	{
+		$class = self::get_share_class(array('share_path' => $path));
+		$share = $class::create(
+			$path,
+			$action == 'shareWritableLink' ? Sharing::WRITABLE : Sharing::READONLY,
+			basename($selected),
+			array(),
+			array('share_writable' => $action == 'shareWritableLink')
+		);
+
+		$arr = array(
+			'share_link'	=> $class::share2link($share),
+			'template'		=> Etemplate\Widget\Template::rel2url('/filemanager/templates/default/share_dialog.xet')
+		);
+		$response = Json\Response::get();
+		$response->data($arr);
+	}
+
 	/**
 	 * Api\Storage\Base instance for egw_sharing table
 	 *