diff --git a/application/asset/js/admin.js b/application/asset/js/admin.js
index 1090be53fd..21a5bef3e3 100644
--- a/application/asset/js/admin.js
+++ b/application/asset/js/admin.js
@@ -178,7 +178,7 @@ var Omeka = {
     },
 
     manageSelectedActions: function() {
-        var selectedOptions = $('[value="update-selected"], [value="delete-selected"]');
+        var selectedOptions = $('#batch-form .batch-inputs [data-select=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 8dc1064f03..06b6413b5c 100644
--- a/application/view/omeka/admin/item-set/browse.phtml
+++ b/application/view/omeka/admin/item-set/browse.phtml
@@ -45,13 +45,13 @@ $sortHeadings = [
     <div class="batch-inputs">
         <select class="batch-actions-select" aria-label="<?php echo $this->translate('Batch actions'); ?>">
             <option value="default"><?php echo $this->translate('Batch actions'); ?></option>
-            <option value="update-selected" disabled="true"><?php echo $this->translate('Edit selected'); ?></option>
-            <option value="update-all"><?php echo $this->translate('Edit all'); ?></option>
-            <option value="delete-selected" disabled="true"><?php echo $this->translate('Delete selected'); ?></option>
-            <option value="delete-all"><?php echo $this->translate('Delete all'); ?></option>
+            <option value="update-selected" data-select="selected" disabled="disabled"><?php echo $this->translate('Edit selected'); ?></option>
+            <option value="update-all" data-select="all"><?php echo $this->translate('Edit all'); ?></option>
+            <option value="delete-selected" data-select="selected" disabled="disabled"><?php echo $this->translate('Delete selected'); ?></option>
+            <option value="delete-all" data-select="all"><?php echo $this->translate('Delete all'); ?></option>
         </select>
         <div class="batch-actions">
-            <button type="button" class="default active" disabled="true"><?php echo $this->translate('Go'); ?></button>
+            <button type="button" class="default active" disabled="disabled"><?php echo $this->translate('Go'); ?></button>
             <input type="submit" class="update-selected" name="update_selected" value="<?php echo $this->translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit'], true)); ?>">
             <input type="submit" class="update-all" name="update_all" value="<?php echo $this->translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit-all'], true)); ?>">
             <input type="hidden" name="query" class="batch-query" value="<?php echo $escape(json_encode($this->params()->fromQuery())); ?>">
diff --git a/application/view/omeka/admin/item/browse.phtml b/application/view/omeka/admin/item/browse.phtml
index e1d7514acc..a2c8843afa 100644
--- a/application/view/omeka/admin/item/browse.phtml
+++ b/application/view/omeka/admin/item/browse.phtml
@@ -44,13 +44,13 @@ $sortHeadings = [
     <div class="batch-inputs">
         <select class="batch-actions-select" aria-label="<?php echo $this->translate('Batch actions'); ?>">
             <option value="default"><?php echo $this->translate('Batch actions'); ?></option>
-            <option value="update-selected" disabled="true"><?php echo $this->translate('Edit selected'); ?></option>
-            <option value="update-all"><?php echo $this->translate('Edit all'); ?></option>
-            <option value="delete-selected" disabled="true"><?php echo $this->translate('Delete selected'); ?></option>
-            <option value="delete-all"><?php echo $this->translate('Delete all'); ?></option>
+            <option value="update-selected" data-select="selected" disabled="disabled"><?php echo $this->translate('Edit selected'); ?></option>
+            <option value="update-all" data-select="all"><?php echo $this->translate('Edit all'); ?></option>
+            <option value="delete-selected" data-select="selected" disabled="disabled"><?php echo $this->translate('Delete selected'); ?></option>
+            <option value="delete-all" data-select="all"><?php echo $this->translate('Delete all'); ?></option>
         </select>
         <div class="batch-actions">
-            <button type="button" class="default active" disabled="true"><?php echo $this->translate('Go'); ?></button>
+            <button type="button" class="default active" disabled="disabled"><?php echo $this->translate('Go'); ?></button>
             <input type="submit" class="update-selected" name="update_selected" value="<?php echo $this->translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit'], true)); ?>">
             <input type="submit" class="update-all" name="update_all" value="<?php echo $this->translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit-all'], true)); ?>">
             <input type="hidden" name="query" class="batch-query" value="<?php echo $escape(json_encode($this->params()->fromQuery())); ?>">
diff --git a/application/view/omeka/admin/media/browse.phtml b/application/view/omeka/admin/media/browse.phtml
index ce9cf40592..25c48e984b 100644
--- a/application/view/omeka/admin/media/browse.phtml
+++ b/application/view/omeka/admin/media/browse.phtml
@@ -41,12 +41,12 @@ $sortHeadings = [
         <select class="batch-actions-select" aria-label="<?php echo $this->translate('Batch actions'); ?>">
             <option value="default"><?php echo $this->translate('Batch actions'); ?></option>
             <?php if ($userIsAllowedBatchUpdate): ?>
-            <option value="update-selected" disabled="disabled"><?php echo $this->translate('Edit selected'); ?></option>
-            <option value="update-all"><?php echo $this->translate('Edit all'); ?></option>
+            <option value="update-selected" data-select="selected" disabled="disabled"><?php echo $this->translate('Edit selected'); ?></option>
+            <option value="update-all" data-select="all"><?php echo $this->translate('Edit all'); ?></option>
             <?php endif; ?>
             <?php if ($userIsAllowedBatchDelete): ?>
-            <option value="delete-selected" disabled="disabled"><?php echo $this->translate('Delete selected'); ?></option>
-            <option value="delete-all"><?php echo $this->translate('Delete all'); ?></option>
+            <option value="delete-selected" data-select="selected" disabled="disabled"><?php echo $this->translate('Delete selected'); ?></option>
+            <option value="delete-all" data-select="all"><?php echo $this->translate('Delete all'); ?></option>
             <?php endif; ?>
         </select>
         <div class="batch-actions">