diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index d7604deae4..84eac7e7f4 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -44,6 +44,8 @@
                 <span id='part-star-icon' class='fas fa-star {% if starred %}icon-yellow{% endif %}'/>
             </button>
 
+            {% settings_value 'BARCODE_ENABLE' as barcodes %}
+            {% if barcodes %}
             <!-- Barcode actions menu -->
             <div class='btn-group'>
                 <button id='barcode-options' title='{% trans "Barcode actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-qrcode'></span> <span class='caret'></span></button>
@@ -52,6 +54,7 @@
                     <li><a href='#' id='print-label'><span class='fas fa-tag'></span> {% trans "Print Label" %}</a></li>
                 </ul>
             </div>
+            {% endif %}
             {% if part.active %}
             <button type='button' class='btn btn-default' id='price-button' title='{% trans "Show pricing information" %}'>
                 <span id='part-price-icon' class='fas fa-dollar-sign'/>
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index feb64cd41d..e73ce8c7f9 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -120,6 +120,8 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
 </div>
 
 <div class='btn-group action-buttons' role='group'>
+    {% settings_value 'BARCODE_ENABLE' as barcodes %}
+    {% if barcodes %}
     <!-- Barcode actions menu -->
     <div class='btn-group'>
         <button id='barcode-options' title='{% trans "Barcode actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-qrcode'></span> <span class='caret'></span></button>
@@ -127,24 +129,26 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
             <li><a href='#' id='show-qr-code'><span class='fas fa-qrcode'></span> {% trans "Show QR Code" %}</a></li>
             {% if roles.stock.change %}
             {% if item.uid %}
-            <li><a href='#' id='unlink-barcode'><span class='fas fa-unlink'></span> {% trans "Unlink Barcode" %}</a></li>
-                {% else %}
-                <li><a href='#' id='link-barcode'><span class='fas fa-link'></span> {% trans "Link Barcode" %}</a></li>
-                {% endif %}
-                {% endif %}
-            </ul>
-        </div>
-        <!-- Document / label menu -->
-        {% if item.has_labels or item.has_test_reports %}
-        <div class='btn-group'>
-            <button id='document-options' title='{% trans "Printing actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-print'></span> <span class='caret'></span></button>
-            <ul class='dropdown-menu' role='menu'>
-                {% if item.has_labels %}
-                <li><a href='#' id='print-label'><span class='fas fa-tag'></span> {% trans "Print Label" %}</a></li>
-                {% endif %}
-                {% if item.has_test_reports %}
-                <li><a href='#' id='stock-test-report'><span class='fas fa-file-pdf'></span> {% trans "Test Report" %}</a></li>
-                {% endif %}
+            <li><a href='#' id='barcode-unlink'><span class='fas fa-unlink'></span> {% trans "Unlink Barcode" %}</a></li>
+            {% else %}
+            <li><a href='#' id='barcode-link'><span class='fas fa-link'></span> {% trans "Link Barcode" %}</a></li>
+            {% endif %}
+            <li><a href='#' id='barcode-scan-into-location'><span class='fas fa-sitemap'></span> {% trans "Scan to Location" %}</a></li>
+            {% endif %}
+        </ul>
+    </div>
+    {% endif %}
+    <!-- Document / label menu -->
+    {% if item.has_labels or item.has_test_reports %}
+    <div class='btn-group'>
+        <button id='document-options' title='{% trans "Printing actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-print'></span> <span class='caret'></span></button>
+        <ul class='dropdown-menu' role='menu'>
+            {% if item.has_labels %}
+            <li><a href='#' id='print-label'><span class='fas fa-tag'></span> {% trans "Print Label" %}</a></li>
+            {% endif %}
+            {% if item.has_test_reports %}
+            <li><a href='#' id='stock-test-report'><span class='fas fa-file-pdf'></span> {% trans "Test Report" %}</a></li>
+            {% endif %}
         </ul>
     </div>
     {% endif %}
@@ -447,14 +451,18 @@ $("#show-qr-code").click(function() {
     });
 });
 
-$("#link-barcode").click(function() {
+$("#barcode-link").click(function() {
     linkBarcodeDialog({{ item.id }});
 });
 
-$("#unlink-barcode").click(function() {
+$("#barcode-unlink").click(function() {
     unlinkBarcode({{ item.id }});
 });
 
+$("#barcode-scan-into-location").click(function() {
+    scanItemIntoLocation({{ item.id }});
+});
+
 {% if item.in_stock %}
 
 $("#stock-assign-to-customer").click(function() {
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index f3501a50cf..4f8268b037 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -37,6 +37,8 @@
                 </button>
             {% endif %}
         {% endif %} 
+        {% settings_value 'BARCODE_ENABLE' as barcodes %}
+        {% if barcodes %}
         <!-- Barcode actions menu -->
         {% if location %}
         <div class='btn-group'>
@@ -47,29 +49,30 @@
                 <li><a href='#' id='barcode-check-in'><span class='fas fa-arrow-right'></span> {% trans "Check-in Items" %}</a></li>
             </ul>
         </div>
-             <!-- Check permissions and owner -->
-            {% if owner_control.value == "False" or owner_control.value == "True" and user in owners or user.is_superuser %}
-                {% if roles.stock.change %}
-                <div class='btn-group'>
-                    <button id='stock-actions' title='{% trans "Stock actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
-                    <ul class='dropdown-menu' role='menu'>
-                        <li><a href='#' id='location-count'><span class='fas fa-clipboard-list'></span>
-                         {% trans "Count stock" %}</a></li>
-                    </ul>
-                </div>
-                {% endif %}
-                {% if roles.stock_location.change %}
-                <div class='btn-group'>
-                    <button id='location-actions' title='{% trans "Location actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle="dropdown"><span class='fas fa-sitemap'></span> <span class='caret'></span></button>
-                    <ul class='dropdown-menu' role='menu'>
-                        <li><a href='#' id='location-edit'><span class='fas fa-edit icon-green'></span> {% trans "Edit location" %}</a></li>
-                        {% if roles.stock.delete %}
-                        <li><a href='#' id='location-delete'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete location" %}</a></li>
-                        {% endif %}
-                    </ul>
-                </div>
-                {% endif %}
+        {% endif %}
+        <!-- Check permissions and owner -->
+        {% if owner_control.value == "False" or owner_control.value == "True" and user in owners or user.is_superuser %}
+            {% if roles.stock.change %}
+            <div class='btn-group'>
+                <button id='stock-actions' title='{% trans "Stock actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
+                <ul class='dropdown-menu' role='menu'>
+                    <li><a href='#' id='location-count'><span class='fas fa-clipboard-list'></span>
+                        {% trans "Count stock" %}</a></li>
+                </ul>
+            </div>
             {% endif %}
+            {% if roles.stock_location.change %}
+            <div class='btn-group'>
+                <button id='location-actions' title='{% trans "Location actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle="dropdown"><span class='fas fa-sitemap'></span> <span class='caret'></span></button>
+                <ul class='dropdown-menu' role='menu'>
+                    <li><a href='#' id='location-edit'><span class='fas fa-edit icon-green'></span> {% trans "Edit location" %}</a></li>
+                    {% if roles.stock.delete %}
+                    <li><a href='#' id='location-delete'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete location" %}</a></li>
+                    {% endif %}
+                </ul>
+            </div>
+            {% endif %}
+        {% endif %}
         {% endif %}
     </div>
 </div>