diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 6ddddbc955..249c053801 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -120,6 +120,9 @@
             <h4>{% trans "Parts" %}</h4>
             {% include "spacer.html" %}
             <div class='btn-group' role='group'>
+                <button type='button' class='btn btn-outline-secondary' id='part-export' title='{% trans "Export Part Data" %}'>
+                    <span class='fas fa-file-download'></span> {% trans "Export" %}
+                </button>
                 {% if roles.part.add %}
                 <button type='button' class='btn btn-success' id='part-create' title='{% trans "Create new part" %}'>
                     <span class='fas fa-plus-circle'></span> {% trans "New Part" %}
@@ -131,9 +134,6 @@
     <div id='part-button-toolbar'>
         <div class='btn-group' role='group'>
             <div class='btn-group' role='group'>
-                <button type='button' class='btn btn-outline-secondary' id='part-export' title='{% trans "Export Part Data" %}'>
-                    <span class='fas fa-file-download'></span> {% trans "Export" %}
-                </button>
                 <button id='part-options' class='btn btn-primary dropdown-toggle' type='button' data-bs-toggle="dropdown">
                     {% trans "Options" %}
                 </button>
diff --git a/InvenTree/templates/js/translated/part.js b/InvenTree/templates/js/translated/part.js
index d3e2840c2b..f622baf333 100644
--- a/InvenTree/templates/js/translated/part.js
+++ b/InvenTree/templates/js/translated/part.js
@@ -1140,10 +1140,6 @@ function loadPartCategoryTable(table, options) {
 
     var params = options.params || {};
 
-    if (tree_view) {
-        params.cascade = true;
-    }
-
     var filterListElement = options.filterList || '#filter-list-category';
 
     var filters = {};
diff --git a/InvenTree/templates/js/translated/stock.js b/InvenTree/templates/js/translated/stock.js
index c7df5e9dc7..318d290305 100644
--- a/InvenTree/templates/js/translated/stock.js
+++ b/InvenTree/templates/js/translated/stock.js
@@ -1438,7 +1438,19 @@ function loadStockLocationTable(table, options) {
         filters[key] = params[key];
     }
 
+    var tree_view = inventreeLoad('location-tree-view') == 1;
+
     table.inventreeTable({
+        treeEnable: tree_view,
+        rootParentId: options.params.parent,
+        uniqueId: 'pk',
+        idField: 'pk',
+        treeShowField: 'name',
+        parentIdField: 'parent',
+        disablePagination: tree_view,
+        sidePagination: tree_view ? 'client' : 'server',
+        serverSort: !tree_view,
+        search: !tree_view,
         method: 'get',
         url: options.url || '{% url "api-location-list" %}',
         queryParams: filters,
@@ -1446,6 +1458,69 @@ function loadStockLocationTable(table, options) {
         name: 'location',
         original: original,
         showColumns: true,
+        onPostBody: function() {
+
+            tree_view = inventreeLoad('location-tree-view') == 1;
+
+            if (tree_view) {
+
+                $('#view-location-list').removeClass('btn-secondary').addClass('btn-outline-secondary');
+                $('#view-location-tree').removeClass('btn-outline-secondary').addClass('btn-secondary');
+                
+                table.treegrid({
+                    treeColumn: 1,
+                    onChange: function() {
+                        table.bootstrapTable('resetView');
+                    },
+                    onExpand: function() {
+                        
+                    }
+                });
+            } else {
+                $('#view-location-tree').removeClass('btn-secondary').addClass('btn-outline-secondary');
+                $('#view-location-list').removeClass('btn-outline-secondary').addClass('btn-secondary');
+            }
+        },
+        buttons: [
+            {
+                icon: 'fas fa-bars',
+                attributes: {
+                    title: '{% trans "Display as list" %}',
+                    id: 'view-location-list',
+                },
+                event: () => {
+                    inventreeSave('location-tree-view', 0);
+                    table.bootstrapTable(
+                        'refreshOptions',
+                        {
+                            treeEnable: false,
+                            serverSort: true,
+                            search: true,
+                            pagination: true,
+                        }
+                    );
+                }
+            },
+            {
+                icon: 'fas fa-sitemap',
+                attributes: {
+                    title: '{% trans "Display as tree" %}',
+                    id: 'view-location-tree',
+                },
+                event: () => {
+                    inventreeSave('location-tree-view', 1);
+                    table.bootstrapTable(
+                        'refreshOptions',
+                        {
+                            treeEnable: true,
+                            serverSort: false,
+                            search: false,
+                            pagination: false,
+                        }
+                    );
+                }
+            }
+        ],
         columns: [
             {
                 checkbox: true,