diff --git a/Neos.Media.Browser/Resources/Private/Partials/ThumbnailView.html b/Neos.Media.Browser/Resources/Private/Partials/ThumbnailView.html
index 615cd9b5672..61b6f08bf3e 100644
--- a/Neos.Media.Browser/Resources/Private/Partials/ThumbnailView.html
+++ b/Neos.Media.Browser/Resources/Private/Partials/ThumbnailView.html
@@ -12,8 +12,8 @@
 		}">
 			<f:for each="{paginatedAssets}" as="asset">
 				<li class="asset">
-					<f:link.action action="edit" class="neos-thumbnail" arguments="{asset: asset}">
-						<div class="neos-img-container draggable-asset {f:if(condition: '{asset.tags -> f:count()} == 0', then: ' neos-media-untagged')}" data-asset-identifier="{asset -> f:format.identifier()}">
+					<f:link.action action="edit" class="neos-thumbnail" arguments="{asset: asset}" data="{asset-identifier: '{asset -> f:format.identifier()}'}">
+						<div class="neos-img-container draggable-asset {f:if(condition: '{asset.tags -> f:count()} == 0', then: ' neos-media-untagged')}">
 							<m:thumbnail asset="{asset}" preset="Neos.Media.Browser:Thumbnail" alt="{asset.label}" async="{settings.asyncThumbnails}" />
 						</div>
 					</f:link.action>
diff --git a/Neos.Media.Browser/Resources/Public/JavaScript/upload.js b/Neos.Media.Browser/Resources/Public/JavaScript/upload.js
index 0307eaec53b..6ed965dafa2 100644
--- a/Neos.Media.Browser/Resources/Public/JavaScript/upload.js
+++ b/Neos.Media.Browser/Resources/Public/JavaScript/upload.js
@@ -114,8 +114,8 @@
 		if (window.parent !== window && window.parent.NeosMediaBrowserCallbacks) {
 			// we are inside iframe
 			$('.asset-list').on('click', '[data-asset-identifier]', function(e) {
-				if ($(e.target).closest('a, button').length === 0) {
-					if(window.parent.NeosMediaBrowserCallbacks && typeof window.parent.NeosMediaBrowserCallbacks.assetChosen === 'function') {
+				if ($(e.target).closest('a, button').not('[data-asset-identifier]').length === 0) {
+					if (window.parent.NeosMediaBrowserCallbacks && typeof window.parent.NeosMediaBrowserCallbacks.assetChosen === 'function') {
 						window.parent.NeosMediaBrowserCallbacks.assetChosen($(this).attr('data-asset-identifier'));
 					}
 					e.preventDefault();