diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html
index c01c9055f1..52b81e6389 100644
--- a/InvenTree/build/templates/build/detail.html
+++ b/InvenTree/build/templates/build/detail.html
@@ -270,6 +270,16 @@
                         </ul>
                     </div>
 
+                    {% if build.has_tracked_bom_items %}
+                    <button id='outputs-expand' class='btn btn-outline-secondary' type='button' title='{% trans "Expand all build output rows" %}'>
+                        <span class='fas fa-expand'></span>
+                    </button>
+
+                    <button id='outputs-collapse' class='btn btn-outline-secondary' type='button' title='{% trans "Collapse all build output rows" %}'>
+                        <span class='fas fa-compress'></span>
+                    </button>
+                    {% endif %}
+
                     {% include "filter_list.html" with id='incompletebuilditems' %}
                 </div>
                 {% endif %}
@@ -416,68 +426,6 @@ onPanelLoad('outputs', function() {
 
     loadBuildOutputTable(build_info);
 
-    linkButtonsToSelection(
-        '#build-output-table',
-        [
-            '#output-options',
-            '#multi-output-complete',
-            '#multi-output-delete',
-        ]
-    );
-
-    $('#multi-output-complete').click(function() {
-        var outputs = $('#build-output-table').bootstrapTable('getSelections');
-
-        completeBuildOutputs(
-            build_info.pk,
-            outputs,
-            {
-                success: function() {
-                    // Reload the "in progress" table
-                    $('#build-output-table').bootstrapTable('refresh');
-
-                    // Reload the "completed" table
-                    $('#build-stock-table').bootstrapTable('refresh');
-                }
-            }
-        );
-    });
-
-    $('#multi-output-delete').click(function() {
-        var outputs = $('#build-output-table').bootstrapTable('getSelections');
-
-        deleteBuildOutputs(
-            build_info.pk,
-            outputs,
-            {
-                success: function() {
-                    // Reload the "in progress" table
-                    $('#build-output-table').bootstrapTable('refresh');
-
-                    // Reload the "completed" table
-                    $('#build-stock-table').bootstrapTable('refresh');
-                }
-            }
-        )
-    });
-
-    $('#incomplete-output-print-label').click(function() {
-        var outputs = $('#build-output-table').bootstrapTable('getSelections');
-
-        if  (outputs.length == 0) {
-            outputs = $('#build-output-table').bootstrapTable('getData');
-        }
-
-        var stock_id_values = [];
-
-        outputs.forEach(function(output) {
-            stock_id_values.push(output.pk);
-        });
-
-        printStockItemLabels(stock_id_values);
-
-    });
-
     {% endif %}
 });
 
diff --git a/InvenTree/templates/js/translated/build.js b/InvenTree/templates/js/translated/build.js
index c91dc1ccc0..935206ce2f 100644
--- a/InvenTree/templates/js/translated/build.js
+++ b/InvenTree/templates/js/translated/build.js
@@ -1233,6 +1233,79 @@ function loadBuildOutputTable(build_info, options={}) {
     $(table).on('collapse-row.bs.table', function(detail, index, row) {
         $(`#button-output-allocate-${row.pk}`).prop('disabled', true);
     });
+
+    // Add callbacks for the various table menubar buttons
+
+    // Complete multiple outputs
+    $('#multi-output-complete').click(function() {
+        var outputs = $(table).bootstrapTable('getSelections');
+
+        if (outputs.length == 0) {
+            outputs = $(table).bootstrapTable('getData');
+        }
+
+        completeBuildOutputs(
+            build_info.pk,
+            outputs,
+            {
+                success: function() {
+                    // Reload the "in progress" table
+                    $('#build-output-table').bootstrapTable('refresh');
+
+                    // Reload the "completed" table
+                    $('#build-stock-table').bootstrapTable('refresh');
+                }
+            }
+        );
+    });
+
+    // Delete multiple build outputs
+    $('#multi-output-delete').click(function() {
+        var outputs = $(table).bootstrapTable('getSelections');
+
+        if (outputs.length == 0) {
+            outputs = $(table).bootstrapTable('getData');
+        }
+
+        deleteBuildOutputs(
+            build_info.pk,
+            outputs,
+            {
+                success: function() {
+                    // Reload the "in progress" table
+                    $('#build-output-table').bootstrapTable('refresh');
+
+                    // Reload the "completed" table
+                    $('#build-stock-table').bootstrapTable('refresh');
+                }
+            }
+        )
+    });
+
+    // Print stock item labels
+    $('#incomplete-output-print-label').click(function() {
+        var outputs = $(table).bootstrapTable('getSelections');
+
+        if  (outputs.length == 0) {
+            outputs = $(table).bootstrapTable('getData');
+        }
+
+        var stock_id_values = [];
+
+        outputs.forEach(function(output) {
+            stock_id_values.push(output.pk);
+        });
+
+        printStockItemLabels(stock_id_values);
+    });
+
+    $('#outputs-expand').click(function() {
+        $(table).bootstrapTable('expandAllRows');
+    });
+
+    $('#outputs-collapse').click(function() {
+        $(table).bootstrapTable('collapseAllRows');
+    });
 }