diff --git a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsView.qml b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsView.qml
index 854b0977ab4..ed755b35db4 100644
--- a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsView.qml
+++ b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsView.qml
@@ -46,6 +46,16 @@ TreeView {
     readonly property int lastRow: root.rows - 1
     property var __createdDirectories: []
 
+    onExpanded:(row) => {
+        let index = root.__modelIndex(row)
+        assetsModel.saveExpandState(assetsModel.filePath(index), true)
+    }
+
+    onCollapsed:(row) => {
+        let index = root.__modelIndex(row)
+        assetsModel.saveExpandState(assetsModel.filePath(index), false)
+    }
+
     rowHeightProvider: (row) => {
         if (row <= root.rootPathRow)
             return 0
@@ -359,8 +369,6 @@ TreeView {
 
         let row = root.rowAtIndex(index)
 
-        assetsModel.saveExpandState(root.currentFilePath, expand)
-
         if (expand)
             root.expand(row)
         else