diff --git a/data/presets.yaml b/data/presets.yaml
index 983a52eb7..e8909a14d 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1540,6 +1540,9 @@ en:
       roof/colour:
         # 'roof:colour=*'
         label: Roof Color
+      room:
+        # room=*
+        label: Type
       rooms:
         # rooms=*
         label: Rooms
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 2b15cd636..85d78ab01 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -277,6 +277,7 @@
     "restriction": {"key": "restriction", "type": "combo", "label": "Type"},
     "restrictions": {"type": "restrictions", "geometry": "vertex", "icon": "iD-restrictions", "reference": {"rtype": "restriction"}, "label": "Turn Restrictions"},
     "roof/colour": {"key": "roof:colour", "type": "combo", "label": "Roof Color"},
+    "room": {"key": "room", "type": "combo", "label": "Type"},
     "rooms": {"key": "rooms", "type": "number", "minValue": 0, "label": "Rooms"},
     "route_master": {"key": "route_master", "type": "combo", "label": "Type"},
     "route": {"key": "route", "type": "combo", "label": "Type"},
diff --git a/data/presets/fields/room.json b/data/presets/fields/room.json
new file mode 100644
index 000000000..88973921e
--- /dev/null
+++ b/data/presets/fields/room.json
@@ -0,0 +1,5 @@
+{
+    "key": "room",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 07ba6801e..c509d36e8 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -498,7 +498,7 @@
     "indoor/area": {"fields": ["level", "name", "ref_room_number", "height"], "geometry": ["area"], "tags": {"indoor": "area"}, "terms": ["indoor space"], "matchScore": 0.8, "name": "Indoor Area"},
     "indoor/corridor": {"icon": "temaki-pedestrian", "fields": ["level", "name", "ref", "height"], "geometry": ["area"], "tags": {"indoor": "corridor"}, "terms": ["concourse", "foyer", "hallway", "passageway"], "matchScore": 0.8, "name": "Indoor Corridor"},
     "indoor/door": {"icon": "maki-entrance-alt1", "fields": ["level", "ref", "door_type", "access_simple", "width", "height"], "moreFields": ["wheelchair"], "geometry": ["vertex"], "tags": {"indoor": "door"}, "addTags": {"indoor": "door", "door": "yes"}, "removeTags": {"indoor": "door", "door": "*"}, "terms": ["doorframe", "doorway", "portal", "room access", "threshold"], "name": "Indoor Door"},
-    "indoor/room": {"fields": ["level", "name", "ref_room_number", "height"], "geometry": ["area"], "tags": {"indoor": "room"}, "terms": ["antechamber", "anteroom", "atrium", "cell", "chamber", "concourse", "foyer", "indoor room", "lobby", "vestibule"], "matchScore": 0.8, "name": "Room"},
+    "indoor/room": {"fields": ["level", "name", "ref_room_number", "room", "height"], "geometry": ["area"], "tags": {"indoor": "room"}, "terms": ["antechamber", "anteroom", "atrium", "cell", "chamber", "concourse", "foyer", "indoor room", "lobby", "vestibule"], "matchScore": 0.8, "name": "Room"},
     "indoor/wall": {"icon": "temaki-wall", "fields": ["level", "height"], "geometry": ["line"], "tags": {"indoor": "wall"}, "terms": ["indoor barrier", "room divider", "room partition"], "name": "Indoor Wall"},
     "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/fee", "internet_access/ssid"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "matchScore": 0.25, "name": "Wi-Fi Hotspot"},
     "junction": {"icon": "temaki-junction", "fields": ["name"], "geometry": ["vertex", "area"], "tags": {"junction": "yes"}, "name": "Junction"},
diff --git a/data/presets/presets/indoor/room.json b/data/presets/presets/indoor/room.json
index d98447cc7..1b70e86ee 100644
--- a/data/presets/presets/indoor/room.json
+++ b/data/presets/presets/indoor/room.json
@@ -3,6 +3,7 @@
         "level",
         "name",
         "ref_room_number",
+        "room",
         "height"
     ],
     "geometry": [
diff --git a/data/taginfo.json b/data/taginfo.json
index b0f6a147c..655622c1e 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1455,6 +1455,7 @@
     {"key": "resource", "description": "🄵 Resources"},
     {"key": "restriction", "description": "🄵 Type"},
     {"key": "roof:colour", "description": "🄵 Roof Color"},
+    {"key": "room", "description": "🄵 Type"},
     {"key": "rooms", "description": "🄵 Rooms"},
     {"key": "route_master", "description": "🄵 Type"},
     {"key": "route", "description": "🄵 Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 0f75e5b53..aa13ffe9d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3435,6 +3435,9 @@
                 "roof/colour": {
                     "label": "Roof Color"
                 },
+                "room": {
+                    "label": "Type"
+                },
                 "rooms": {
                     "label": "Rooms"
                 },