diff --git a/betty/extension/cotton_candy/assets/templates/entity/featured--place.html.j2 b/betty/extension/cotton_candy/assets/templates/entity/featured--place.html.j2
index 60ca80097..5afadecdf 100644
--- a/betty/extension/cotton_candy/assets/templates/entity/featured--place.html.j2
+++ b/betty/extension/cotton_candy/assets/templates/entity/featured--place.html.j2
@@ -16,7 +16,13 @@
- {% with entities = [entity], map_hides_list = True, featured = False %}
- {% include ['entity/list--place.html.j2', 'entity/list.html.j2'] %}
- {% endwith %}
+ {% set places = entity | walk('encloses') | select('place_entity') | list %}
+ {% if entity.coordinates %}
+ {% set places = places + [entity] %}
+ {% endif %}
+ {% if places | length > 0 %}
+ {% with entities = places, hide_list = True, featured = False %}
+ {% include ['entity/list--place.html.j2', 'entity/list.html.j2'] %}
+ {% endwith %}
+ {% endif %}
diff --git a/betty/extension/cotton_candy/assets/templates/entity/list--place.html.j2 b/betty/extension/cotton_candy/assets/templates/entity/list--place.html.j2
index f347fdc5a..c74027386 100644
--- a/betty/extension/cotton_candy/assets/templates/entity/list--place.html.j2
+++ b/betty/extension/cotton_candy/assets/templates/entity/list--place.html.j2
@@ -4,7 +4,7 @@
{% if 'betty.extension.Maps' in app.extensions and entities | rejectattr('coordinates', 'none') | list | length > 0 %}
{% endif %}
-
+
{% for place in entities | sort_localizeds(localized_attribute='names', sort_attribute='name') %}
-
{% with entity = place %}