diff --git a/CHANGELOG.md b/CHANGELOG.md
index e89395119..c13024921 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,8 @@ _Breaking developer changes, which may affect downstream projects or sites that
 
 #### :newspaper: News
 * Drop legacy support for Internet Explorer 11 ([#8811])
+#### :white_check_mark: Validation
+* Handle indoor features like buildings when checking for crossing ways ([#8944])
 #### :rocket: Presets
 * Optimize order of values in dropdowns of `access` fields ([#8945])
 #### :hammer: Development
@@ -50,6 +52,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 
 [#8774]: https://github.com/openstreetmap/iD/pull/8774
 [#8811]: https://github.com/openstreetmap/iD/issues/8811
+[#8944]: https://github.com/openstreetmap/iD/issues/8944
 [#8945]: https://github.com/openstreetmap/iD/issues/8945
 
 
diff --git a/modules/validations/crossing_ways.js b/modules/validations/crossing_ways.js
index 0b12bfe9b..aec7b4094 100644
--- a/modules/validations/crossing_ways.js
+++ b/modules/validations/crossing_ways.js
@@ -109,7 +109,8 @@ export function validationCrossingWays(context) {
         if (featureType1 === 'waterway' && featureType2 === 'highway' && tags2.man_made === 'pier') return true;
         if (featureType2 === 'waterway' && featureType1 === 'highway' && tags1.man_made === 'pier') return true;
 
-        if (featureType1 === 'building' || featureType2 === 'building') {
+        if (featureType1 === 'building' || featureType2 === 'building' ||
+            taggedAsIndoor(tags1) || taggedAsIndoor(tags2)) {
             // for building crossings, different layers are enough
             if (layer1 !== layer2) return true;
         }