diff --git a/openbis_ng_ui/src/js/components/common/browser/BrowserTreeController.js b/openbis_ng_ui/src/js/components/common/browser/BrowserTreeController.js
index f967ef519071c68c205fb23b687a9dfccde46489..33e05ec90a2af9d1f2aebaaf65b72391e54fd9af 100644
--- a/openbis_ng_ui/src/js/components/common/browser/BrowserTreeController.js
+++ b/openbis_ng_ui/src/js/components/common/browser/BrowserTreeController.js
@@ -27,7 +27,8 @@ export default class BrowserTreeController {
       selectedObject: null,
       expandedIds: {},
       expandAllIds: {},
-      sortingIds: {}
+      sortingIds: {},
+      customSortings: {}
     })
     this.context = context
     this.lastTree = null
@@ -545,6 +546,13 @@ export default class BrowserTreeController {
       } else {
         delete state.expandedIds[nodeId]
       }
+
+      state.expandAllIds = { ...state.expandAllIds }
+      Object.keys(state.expandAllIds).forEach(expandAllNodeId => {
+        if (nodeId.startsWith(expandAllNodeId)) {
+          delete state.expandAllIds[expandAllNodeId]
+        }
+      })
     }
   }