diff --git a/assets/controllers/elements/datatables/parts_controller.js b/assets/controllers/elements/datatables/parts_controller.js
index 1fe11a20..23e110af 100644
--- a/assets/controllers/elements/datatables/parts_controller.js
+++ b/assets/controllers/elements/datatables/parts_controller.js
@@ -42,11 +42,11 @@ export default class extends DatatablesController {
 
         const selectPanel = this.selectPanelTarget;
 
-        //Hide/Unhide panel with the selection tools
+        //Toggle action button based on selection
         if (count > 0) {
-            selectPanel.classList.remove('d-none');
+            document.getElementById("selectPanel_submit").disabled = false; 
         } else {
-            selectPanel.classList.add('d-none');
+            document.getElementById("selectPanel_submit").disabled = true; 
         }
 
         //Update selection count text
diff --git a/templates/components/datatables.macro.html.twig b/templates/components/datatables.macro.html.twig
index 5ce0f23f..28885432 100644
--- a/templates/components/datatables.macro.html.twig
+++ b/templates/components/datatables.macro.html.twig
@@ -29,14 +29,14 @@
 
         <input type="hidden" name="ids" {{ stimulus_target('elements/datatables/parts', 'selectIDs') }} value="">
 
-        <div class="d-none mb-2" {{ stimulus_target('elements/datatables/parts', 'selectPanel') }}>
+        <div class="mb-2" {{ stimulus_target('elements/datatables/parts', 'selectPanel') }}>
             {# <span id="select_count"></span> #}
 
             <div class="input-group">
                 <button class="btn btn-outline-secondary" type="button" {{ stimulus_action('elements/datatables/parts', 'invertSelection')}}
                         title="{% trans %}part_list.action.invert_selection{% endtrans %}" ><i class="fa-solid fa-arrow-right-arrow-left"></i></button>
                 <span class="input-group-text">
-                    <span class="badge bg-primary">{% trans with {'%count%': '<span ' ~ stimulus_target('elements/datatables/parts', 'selectCount') ~ '></span>'} %}part_list.action.part_count{% endtrans %}</span>
+                    <span class="badge bg-primary">{% trans with {'%count%': '<span ' ~ stimulus_target('elements/datatables/parts', 'selectCount') ~ '>0</span>'} %}part_list.action.part_count{% endtrans %}</span>
                 </span>
 
                 <select class="form-select" name="action" data-controller="elements--select" {{ stimulus_action('elements/datatables/parts', 'updateTargetPicker', 'change') }}
@@ -79,7 +79,7 @@
                     {# This is left empty, as this will be filled by Javascript #}
                 </select>
 
-                <button type="submit" class="btn btn-primary">{% trans %}part_list.action.submit{% endtrans %}</button>
+                <button id="selectPanel_submit" disabled type="submit" class="btn btn-primary">{% trans %}part_list.action.submit{% endtrans %}</button>
             </div>
         </div>