diff --git a/InvenTree/part/templates/part/stock.html b/InvenTree/part/templates/part/stock.html
index 9f628fef1c..a821652aae 100644
--- a/InvenTree/part/templates/part/stock.html
+++ b/InvenTree/part/templates/part/stock.html
@@ -9,7 +9,7 @@
 <div id='button-toolbar'>
     <button class='btn btn-success' id='add-stock-item'>New Stock Item</button>
     <div id='opt-dropdown' class="dropdown" style='float: right;'>
-        <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
+        <button id='stock-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
             <span class="caret"></span></button>
             <ul class="dropdown-menu">
                 <li><a href='#' id='multi-item-take' title='Take items from stock'>Take items</a></li>
@@ -49,6 +49,9 @@
         params: {
             part: {{ part.id }},
         },
+        buttons: [
+            '#stock-options',
+        ],
         url: "{% url 'api-stock-list' %}",
     });
 
diff --git a/InvenTree/static/script/inventree/stock.js b/InvenTree/static/script/inventree/stock.js
index c0a931cdbf..9785cc3c3d 100644
--- a/InvenTree/static/script/inventree/stock.js
+++ b/InvenTree/static/script/inventree/stock.js
@@ -319,8 +319,11 @@ function deleteStockItems(items, options) {
 }
 
 
-function loadStockTable(modal, options) {
-    modal.bootstrapTable({
+
+
+function loadStockTable(table, options) {
+
+    table.bootstrapTable({
         sortable: true,
         search: true,
         method: 'get',
@@ -376,4 +379,8 @@ function loadStockTable(modal, options) {
         ],
         url: options.url,
     });
+
+    if (options.buttons) {
+        linkButtonsToSelection(table, options.buttons);
+    }
 };
\ No newline at end of file
diff --git a/InvenTree/static/script/inventree/tables.js b/InvenTree/static/script/inventree/tables.js
index c6ff11525a..1ff1903326 100644
--- a/InvenTree/static/script/inventree/tables.js
+++ b/InvenTree/static/script/inventree/tables.js
@@ -60,3 +60,23 @@ function renderEditable(text, options) {
     return html;
 }
 
+function enableButtons(elements, enabled) {
+    for (let item of elements) {
+        $(item).prop('disabled', !enabled);
+    }
+}
+
+
+function linkButtonsToSelection(table, buttons) {
+    /* Link a bootstrap-table object to one or more buttons.
+     * The buttons will only be enabled if there is at least one row selected
+     */
+
+    // Initially set the enable state of the buttons
+    enableButtons(buttons, table.bootstrapTable('getSelections').length > 0);
+
+    // Add a callback
+    table.on('check.bs.table uncheck.bs.table check-some.bs.table uncheck-some.bs.table check-all.bs.table uncheck-all.bs.table', function(row) {
+        enableButtons(buttons, table.bootstrapTable('getSelections').length > 0);
+    });
+}
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 79a93ccda1..1483d8fc4f 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -43,7 +43,7 @@
     <div class='container-fluid' style='float: right;'>
         <button class="btn btn-success" id='item-create'>New Stock Item</span></button>
         <div class="dropdown" style='float: right;'>
-            <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
+            <button id='stock-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
             <span class="caret"></span></button>
             <ul class="dropdown-menu">
                 <li><a href="#" id='multi-item-add' title='Add to selected stock items'>Add stock</a></li>
@@ -158,6 +158,9 @@
     });
 
     loadStockTable($("#stock-table"), {
+        buttons: [
+            '#stock-options',
+        ],
         params: {
             {% if location %}
             location: {{ location.id }},