diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index f8d89828f4..0a01c5af0a 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -122,6 +122,10 @@
 				}
 			});
 
+			fileList.$el.on('changeDirectory', function() {
+				OCA.Sharing.sharesLoaded = false;
+			});
+
 			fileActions.registerAction({
 				name: 'Share',
 				displayName: '',
diff --git a/core/js/share.js b/core/js/share.js
index 9baa34d9bb..9539e92e09 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -50,17 +50,29 @@ OC.Share = _.extend(OC.Share || {}, {
 	 * @param callback function to call after the shares were loaded
 	 */
 	loadIcons:function(itemType, fileList, callback) {
+		var path = fileList.dirInfo.path;
+		if (path === '/') {
+			path = '';
+		}
+		path += '/' + fileList.dirInfo.name;
+
 		// Load all share icons
 		$.get(
-			OC.filePath('core', 'ajax', 'share.php'),
+			OC.linkToOCS('apps/files_sharing/api/v1', 2) + 'shares',
 			{
-				fetch: 'getItemsSharedStatuses',
-				itemType: itemType
+				subfiles: 'true',
+				path: path,
+				format: 'json'
 			}, function(result) {
-				if (result && result.status === 'success') {
+				if (result && result.ocs.meta.statuscode === 200) {
 					OC.Share.statuses = {};
-					$.each(result.data, function(item, data) {
-						OC.Share.statuses[item] = data;
+					$.each(result.ocs.data, function(it, share) {
+						if (!(share.item_source in OC.Share.statuses)) {
+							OC.Share.statuses[share.item_source] = {link: false};
+						}
+						if (share.share_type === OC.Share.SHARE_TYPE_LINK) {
+							OC.Share.statuses[share.item_source] = {link: true};
+						}
 					});
 					if (_.isFunction(callback)) {
 						callback(OC.Share.statuses);