diff --git a/bundles/org.openhab.ui/web/src/components/model/model-picker-popup.vue b/bundles/org.openhab.ui/web/src/components/model/model-picker-popup.vue
index a6b2dc96c1..07d9eff680 100644
--- a/bundles/org.openhab.ui/web/src/components/model/model-picker-popup.vue
+++ b/bundles/org.openhab.ui/web/src/components/model/model-picker-popup.vue
@@ -87,7 +87,7 @@ export default {
       includeNonSemantic: false,
       includeItemName: this.$f7.data.modelPicker.includeItemName || false,
       includeItemTags: this.$f7.data.modelPicker.includeItemTags || false,
-      expanded: false,
+      expanded: this.$f7.data.modelPicker.expanded || false,
       doubleClickStarted: null,
       doubleClickItem: null,
       items: [],
@@ -215,7 +215,10 @@ export default {
 
         this.loading = false
         this.ready = true
-        this.$nextTick(() => { this.initSearchbar = true })
+        this.$nextTick(() => {
+          this.initSearchbar = true
+          this.applyExpandedOption()
+        })
       })
     },
     getChildren (parent) {
@@ -315,7 +318,10 @@ export default {
     },
     toggleExpanded () {
       this.expanded = !this.expanded
-
+      this.$f7.data.modelPicker.expanded = this.expanded
+      this.applyExpandedOption()
+    },
+    applyExpandedOption () {
       const treeviewItems = document.querySelectorAll('.treeview-item')
 
       treeviewItems.forEach(item => {
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue b/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue
index b4202d7d40..08602a53dc 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue
@@ -256,7 +256,7 @@ export default {
       includeNonSemantic: false,
       includeItemName: this.$f7.data.model.includeItemName || false,
       includeItemTags: this.$f7.data.model.includeItemTags || false,
-      expanded: false,
+      expanded: this.$f7.data.model.expanded || false,
       items: [],
       links: [],
       locations: [],
@@ -374,7 +374,10 @@ export default {
 
         this.loading = false
         this.ready = true
-        this.$nextTick(() => { this.initSearchbar = true })
+        this.$nextTick(() => {
+          this.initSearchbar = true
+          this.applyExpandedOption()
+        })
         if (!this.eventSource) this.startEventSource()
       })
     },
@@ -491,7 +494,10 @@ export default {
     },
     toggleExpanded () {
       this.expanded = !this.expanded
-
+      this.$f7.data.model.expanded = this.expanded
+      this.applyExpandedOption()
+    },
+    applyExpandedOption () {
       const treeviewItems = document.querySelectorAll('.treeview-item')
 
       treeviewItems.forEach(item => {