diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 343d7a8c40..6a076ef8ca 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -36,9 +36,9 @@
 </div>
 
 {% if category and category.children.all|length > 0 %}
-{% include "part/subcategories.html" with children=category.children.all collapse_id="children"%}
+{% include "part/subcategories.html" with children=category.children.all collapse_id="categories" %}
 {% elif children|length > 0 %}
-{% include "part/subcategories.html" with children=children %}
+{% include "part/subcategories.html" with children=children collapse_id="categories" %}
 {% endif %}
 <hr>
 
@@ -65,6 +65,18 @@
 {% block js_ready %}
 {{ block.super }}
 
+    if (sessionStorage.getItem("inventree-show-part-categories")) {
+        $("#collapse-item-categories").collapse('show');
+    }
+
+    $("#collapse-item-categories").on('shown.bs.collapse', function() {
+        sessionStorage.setItem('inventree-show-part-categories', 1);
+    });
+    
+    $("#collapse-item-categories").on('hidden.bs.collapse', function() {
+        sessionStorage.removeItem('inventree-show-part-categories');
+    });
+
     $("#cat-create").click(function() {
         launchModalForm(
                         "{% url 'category-create' %}",
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 8fbf26166d..30adba9336 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -54,6 +54,19 @@
 {% endblock %}
 {% block js_ready %}
 {{ block.super }}
+
+    if (sessionStorage.getItem("inventree-show-part-locations")) {
+        $("#collapse-item-locations").collapse('show');
+    }
+
+    $("#collapse-item-locations").on('shown.bs.collapse', function() {
+        sessionStorage.setItem('inventree-show-part-locations', 1);
+    });
+
+    $("#collapse-item-locations").on('hidden.bs.collapse', function() {
+        sessionStorage.removeItem('inventree-show-part-locations');
+    });
+
     $('#location-create').click(function () {
         launchModalForm("{% url 'stock-location-create' %}",
                         {