diff --git a/assets/layers/hut/hut.json b/assets/layers/hut/hut.json
index 2aac48426..7620f1bfa 100644
--- a/assets/layers/hut/hut.json
+++ b/assets/layers/hut/hut.json
@@ -148,6 +148,12 @@
     {
       "id": "preset_type",
       "render": "{preset_type_select()}"
+    },
+    {
+      "builtin": "shelter.shelter-type",
+      "override": {
+        "condition": "amenity=shelter"
+      }
     }
   ],
   "filter":[
@@ -157,4 +163,4 @@
     "enableRelocation": false,
     "enableImproveAccuracy": true
   }
-}
\ No newline at end of file
+}
diff --git a/assets/themes/nature/nature.json b/assets/themes/nature/nature.json
index 0973a354d..a91c126a1 100644
--- a/assets/themes/nature/nature.json
+++ b/assets/themes/nature/nature.json
@@ -60,8 +60,8 @@
     "nature_reserve",
     {
       "builtin": [
-        "shelter",
-        "hut"
+        "hut",
+        "shelter"
       ],
       "override": {
         "minzoom": 11
@@ -97,4 +97,4 @@
     "observation_tower",
     "viewpoint"
   ]
-}
\ No newline at end of file
+}