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 cd1e05ee62..ba0ddc4b99 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
@@ -26,7 +26,9 @@
           <f7-button v-else color="gray" icon-size="24" tooltip="Collapse" icon-f7="rectangle_compress_vertical" @click="toggleExpanded()" />
         </div>
       </f7-subnavbar>
-      <f7-toolbar bottom class="toolbar-details">
+
+      <!-- Toolbar -->
+      <f7-toolbar v-if="$f7.width >= 500" bottom class="toolbar-details">
         <f7-link v-if="!multiple" :disabled="selectedItem != null" class="left" @click="selectedItem = null">
           Clear
         </f7-link>
@@ -40,8 +42,27 @@
           <label @click="toggleItemTags" class="advanced-label">Show tags</label>
         </div>
         <span />
-        <!-- <f7-link class="right details-link padding-right" ref="detailsLink" @click="detailsOpened = true" icon-f7="chevron_up"></f7-link> -->
       </f7-toolbar>
+      <f7-toolbar v-else bottom class="toolbar-details" style="height: calc(50px + var(--f7-safe-area-bottom))">
+        <f7-link v-if="!multiple" :disabled="selectedItem != null" class="left" @click="selectedItem = null">
+          Clear
+        </f7-link>
+        <span v-else />
+        <div class="padding-left padding-right text-align-center" style="font-size: 12px">
+          <div>
+            <f7-checkbox :checked="includeNonSemantic" @change="toggleNonSemantic" />
+            <label @click="toggleNonSemantic" class="advanced-label">Show non-semantic</label>
+          </div>
+          <div>
+            <f7-checkbox :checked="includeItemName" @change="toggleItemName" />
+            <label @click="toggleItemName" class="advanced-label">Show name</label>
+            <f7-checkbox style="margin-left: 5px" :checked="includeItemTags" @change="toggleItemTags" />
+            <label @click="toggleItemTags" class="advanced-label">Show tags</label>
+          </div>
+        </div>
+        <span />
+      </f7-toolbar>
+
       <f7-block strong class="no-padding" v-if="ready">
         <model-treeview class="model-picker-treeview" :root-nodes="rootNodes"
                         :includeItemName="includeItemName" :includeItemTags="includeItemTags"
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 3ea0d94690..c2ca04a47f 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
@@ -35,7 +35,7 @@
       </div>
       <f7-link class="right details-link padding-right" ref="detailsLink" @click="detailsOpened = true" icon-f7="chevron_up" />
     </f7-toolbar>
-    <f7-toolbar bottom class="toolbar-details" v-else style="height: 50px">
+    <f7-toolbar v-else bottom class="toolbar-details" style="height: calc(50px + var(--f7-safe-area-bottom))">
       <f7-link :disabled="selectedItem != null" class="left" @click="selectedItem = null">
         Clear
       </f7-link>