diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
index d85159848f1291ec85029cef773aa9b6602910c5..e6c51035372021e324c9e2ae240e646ec5b20dab 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
@@ -62,6 +62,7 @@
 											uri="{f:uri.action(action:'updateCommentForUpdatableVersions',controller:'Download',arguments:{extension:extension.key, integerVersion: extension.terObject.integerVersion},format:'json')}"
 											icon="actions-system-extension-update"
 											title="{f:translate(key:'extensionList.updateToVersion', arguments:{0:extension.updateToVersion.version})}"
+											additionalAttributes="{data-action:'update-extension'}"
 										/>
 									</span>
 								</f:else>
diff --git a/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js b/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
index df90a015e68d5f01203acc56cf2387565525b8d1..bda9eae5e81169b1516bbbe61d915d591b74bb41 100644
--- a/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
+++ b/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
@@ -97,20 +97,15 @@ define(['jquery', 'datatables', 'jquery/jquery.clearable'], function($) {
 			});
 		});
 
-		$('.t3-icon-system-extension-update').parent().each(function() {
-			var $me = $(this);
-			$me.data('href', $me.attr('href'));
-			$me.attr('href', '#');
-			$me.addClass('transformed');
-			$me.click(function() {
-				$.ajax({
-					url: $(this).data('href'),
-					dataType: 'json',
-					beforeSend: function() {
-						$(ExtensionManager.identifier.extensionManager).mask();
-					},
-					success: ExtensionManager.updateExtension
-				});
+		$('a[data-action=update-extension]').click(function(e) {
+			e.preventDefault();
+			$.ajax({
+				url: $(this).attr('href'),
+				dataType: 'json',
+				beforeSend: function() {
+					$(ExtensionManager.identifier.extensionManager).mask();
+				},
+				success: ExtensionManager.updateExtension
 			});
 		});
 	};