diff --git a/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html b/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html
index eb9eb33ced97..1f586721fa4e 100644
--- a/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html
+++ b/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html
@@ -45,14 +45,14 @@
 			</table>
 		</div>
 		<div>
-			<button class="btn btn-default disabled" data-action="massundo">
+			<button class="btn btn-default disabled" data-action="massundo" disabled>
 				<core:icon identifier="actions-edit-undo" />
 				<span class="text">
 					<f:translate key="button.undo" />
 				</span>
 			</button>
 			<f:if condition="{allowDelete}">
-				<button class="btn btn-default disabled" data-action="massdelete">
+				<button class="btn btn-default disabled" data-action="massdelete" disabled>
 					<core:icon identifier="actions-edit-delete" />
 					<span class="text">
 						<f:translate key="button.delete" />
diff --git a/typo3/sysext/recycler/Resources/Public/JavaScript/Recycler.js b/typo3/sysext/recycler/Resources/Public/JavaScript/Recycler.js
index 2c9f8901a01f..c6f9af49fa8d 100644
--- a/typo3/sysext/recycler/Resources/Public/JavaScript/Recycler.js
+++ b/typo3/sysext/recycler/Resources/Public/JavaScript/Recycler.js
@@ -240,10 +240,10 @@ define(['jquery',
 
     if (Recycler.markedRecordsForMassAction.length > 0) {
       if (Recycler.elements.$massUndo.hasClass('disabled')) {
-        Recycler.elements.$massUndo.removeClass('disabled');
+        Recycler.elements.$massUndo.removeClass('disabled').removeAttr('disabled');
       }
       if (Recycler.elements.$massDelete.hasClass('disabled')) {
-        Recycler.elements.$massDelete.removeClass('disabled');
+        Recycler.elements.$massDelete.removeClass('disabled').removeAttr('disabled');
       }
 
       var btnTextUndo = Recycler.createMessage(TYPO3.lang['button.undoselected'], [Recycler.markedRecordsForMassAction.length]),
@@ -262,9 +262,9 @@ define(['jquery',
    */
   Recycler.resetMassActionButtons = function() {
     Recycler.markedRecordsForMassAction = [];
-    Recycler.elements.$massUndo.addClass('disabled');
+    Recycler.elements.$massUndo.addClass('disabled').attr('disabled', true);
     Recycler.elements.$massUndo.find('span.text').text(TYPO3.lang['button.undo']);
-    Recycler.elements.$massDelete.addClass('disabled');
+    Recycler.elements.$massDelete.addClass('disabled').attr('disabled', true);
     Recycler.elements.$massDelete.find('span.text').text(TYPO3.lang['button.delete']);
   };