diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index f199cc5981..d03d18be44 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -41,7 +41,15 @@
 <hr>
 
 <div id='button-toolbar'>
-    <button style='float: right;' class='btn btn-success' id='part-create'>New Part</button>
+    <div class='container-fluid' style="float: right;">
+        <button class='btn btn-success' id='part-create'>New Part</button>
+        <div class='dropdown' style='float: right;'>
+            <button id='part-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-part-category' title='Set Part Category'>Set Category</a></li>
+            </ul>
+        </div>
+    </div>
 </div>
 
 <table class='table table-striped table-condensed' data-toolbar='#button-toolbar' id='part-table'>
@@ -50,6 +58,7 @@
 {% endblock %}
 {% block js_load %}
 {{ block.super }}
+<script type='text/javascript' src="{% static 'script/inventree/api.js' %}"></script>
 <script type='text/javacript' src="{% static 'script/inventree/stock.js' %}"></script>
 {% endblock %}
 {% block js_ready %}
@@ -179,4 +188,9 @@
         url: "{% url 'api-part-list' %}",
     });
 
+    linkButtonsToSelection(
+        $("#part-table"),
+        ['#part-options']
+    );
+
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 015a6673b4..66d1fd2179 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -43,10 +43,9 @@
 
 <div id='button-toolbar'>
     <div class='container-fluid' style='float: right;'>
-        <button class="btn btn-success" id='item-create'>New Stock Item</span></button>
+        <button class="btn btn-success" id='item-create'>New Stock Item</button>
         <div class="dropdown" style='float: right;'>
-            <button id='stock-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
-            <span class="caret"></span></button>
+            <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>
                 <li><a href="#" id='multi-item-remove' title='Remove from selected stock items'>Remove stock</a></li>