diff --git a/js/vendor/nextcloud/share.js b/js/vendor/nextcloud/share.js
index db22c3c33..a939e0712 100644
--- a/js/vendor/nextcloud/share.js
+++ b/js/vendor/nextcloud/share.js
@@ -495,7 +495,8 @@
 									.tooltip('hide')
 									.tooltip({
 										placement: 'bottom',
-										trigger: 'manual'
+										trigger: 'manual',
+										trackTooltip: true
 									})
 									.tooltip('fixTitle')
 									.tooltip('show');
@@ -805,6 +806,7 @@
 		 */
 		hideDropDown: function (callback) {
 			this.currentShares = null;
+			$('[data-original-title]').tooltip('hide');
 			$('#dropdown').slideUp(OC.menuSpeed, function () {
 				Gallery.Share.droppedDown = false;
 				$('#dropdown').remove();