diff --git a/application/asset/js/global.js b/application/asset/js/global.js
index 9c2069488a..a201e56c92 100644
--- a/application/asset/js/global.js
+++ b/application/asset/js/global.js
@@ -188,7 +188,7 @@ var Omeka = {
     },
 
     manageSelectedActions: function() {
-        var selectedOptions = $('#batch-form .batch-inputs [data-select=selected]');
+        var selectedOptions = $('#batch-form .batch-inputs .batch-selected');
         if ($('.batch-edit td input[type="checkbox"]:checked').length > 0) {
             selectedOptions.removeAttr('disabled');
         } else {
diff --git a/application/view/omeka/admin/item-set/browse.phtml b/application/view/omeka/admin/item-set/browse.phtml
index 9448baaabc..e4cdf21950 100644
--- a/application/view/omeka/admin/item-set/browse.phtml
+++ b/application/view/omeka/admin/item-set/browse.phtml
@@ -53,12 +53,12 @@ $userIsAllowedBatchDelete = $this->userIsAllowed('Omeka\Api\Adapter\ItemSetAdapt
         <select class="batch-actions-select" name="batch_action" aria-label="<?php echo $translate('Batch actions'); ?>">
             <option value="default"><?php echo $translate('Batch actions'); ?></option>
             <?php if ($userIsAllowedBatchUpdate): ?>
-            <option value="update-selected" data-select="selected" disabled><?php echo $translate('Edit selected'); ?></option>
-            <option value="update-all" data-select="all"><?php echo $translate('Edit all'); ?></option>
+            <option value="update-selected" class="batch-selected" disabled><?php echo $translate('Edit selected'); ?></option>
+            <option value="update-all"><?php echo $translate('Edit all'); ?></option>
             <?php endif; ?>
             <?php if ($userIsAllowedBatchDelete): ?>
-            <option value="delete-selected" data-select="selected" disabled><?php echo $translate('Delete selected'); ?></option>
-            <option value="delete-all" data-select="all"><?php echo $translate('Delete all'); ?></option>
+            <option value="delete-selected" class="batch-selected" disabled><?php echo $translate('Delete selected'); ?></option>
+            <option value="delete-all"><?php echo $translate('Delete all'); ?></option>
             <?php endif; ?>
         </select>
         <div class="batch-actions">
diff --git a/application/view/omeka/admin/item/browse.phtml b/application/view/omeka/admin/item/browse.phtml
index e764d792bc..9095b3efc6 100644
--- a/application/view/omeka/admin/item/browse.phtml
+++ b/application/view/omeka/admin/item/browse.phtml
@@ -53,12 +53,12 @@ $userIsAllowedBatchDelete = $this->userIsAllowed('Omeka\Api\Adapter\ItemAdapter'
         <select class="batch-actions-select" name="batch_action" aria-label="<?php echo $translate('Batch actions'); ?>">
             <option value="default"><?php echo $translate('Batch actions'); ?></option>
             <?php if ($userIsAllowedBatchUpdate): ?>
-            <option value="update-selected" data-select="selected" disabled><?php echo $translate('Edit selected'); ?></option>
-            <option value="update-all" data-select="all"><?php echo $translate('Edit all'); ?></option>
+            <option value="update-selected" class="batch-selected" disabled><?php echo $translate('Edit selected'); ?></option>
+            <option value="update-all"><?php echo $translate('Edit all'); ?></option>
             <?php endif; ?>
             <?php if ($userIsAllowedBatchDelete): ?>
-            <option value="delete-selected" data-select="selected" disabled><?php echo $translate('Delete selected'); ?></option>
-            <option value="delete-all" data-select="all"><?php echo $translate('Delete all'); ?></option>
+            <option value="delete-selected" class="batch-selected" disabled><?php echo $translate('Delete selected'); ?></option>
+            <option value="delete-all"><?php echo $translate('Delete all'); ?></option>
             <?php endif; ?>
         </select>
         <div class="batch-actions">
diff --git a/application/view/omeka/admin/media/browse.phtml b/application/view/omeka/admin/media/browse.phtml
index 57d4bd136f..cb5c469fc3 100644
--- a/application/view/omeka/admin/media/browse.phtml
+++ b/application/view/omeka/admin/media/browse.phtml
@@ -51,12 +51,12 @@ $userIsAllowedBatchDelete = $this->userIsAllowed('Omeka\Api\Adapter\MediaAdapter
         <select class="batch-actions-select" name="batch_action" aria-label="<?php echo $translate('Batch actions'); ?>">
             <option value="default"><?php echo $translate('Batch actions'); ?></option>
             <?php if ($userIsAllowedBatchUpdate): ?>
-            <option value="update-selected" data-select="selected" disabled><?php echo $translate('Edit selected'); ?></option>
-            <option value="update-all" data-select="all"><?php echo $translate('Edit all'); ?></option>
+            <option value="update-selected" class="batch-selected" disabled><?php echo $translate('Edit selected'); ?></option>
+            <option value="update-all"><?php echo $translate('Edit all'); ?></option>
             <?php endif; ?>
             <?php if ($userIsAllowedBatchDelete): ?>
-            <option value="delete-selected" data-select="selected" disabled><?php echo $translate('Delete selected'); ?></option>
-            <option value="delete-all" data-select="all"><?php echo $translate('Delete all'); ?></option>
+            <option value="delete-selected" class="batch-selected" disabled><?php echo $translate('Delete selected'); ?></option>
+            <option value="delete-all"><?php echo $translate('Delete all'); ?></option>
             <?php endif; ?>
         </select>
         <div class="batch-actions">