diff --git a/11ty/_includes/components/table-of-content-item.njk b/11ty/_includes/components/table-of-content-item.njk
index 05643741..6359c1e6 100644
--- a/11ty/_includes/components/table-of-content-item.njk
+++ b/11ty/_includes/components/table-of-content-item.njk
@@ -1,4 +1,4 @@
-<li>
+<li class="toc__list-item">
   {{ definition.data.title | linkIfExistsInCollection(collections.definedWords) | safe  }}
   {%- if
     definition.data.flag and
diff --git a/11ty/_includes/components/table-of-content.njk b/11ty/_includes/components/table-of-content.njk
index aa1ce1fc..5f1458e1 100644
--- a/11ty/_includes/components/table-of-content.njk
+++ b/11ty/_includes/components/table-of-content.njk
@@ -1,16 +1,16 @@
 <section>
   <nav class="" aria-label="Definitions">
     <ol class="multi-column u-no-padding-left list">
-    {% for section in collections.tableOfContent %}
-      <li>
-        <span class="sub-headline">{{ section.title }}</span>
-        <ol>
-          {% for definition in section.definitions %}
-            {% include 'components/table-of-content-item.njk' %}
-          {% endfor %}
-        </ol>
-      </li>
-    {% endfor %}
+      {% for section in collections.tableOfContent %}
+        <li>
+          <span class="sub-headline">{{ section.title }}</span>
+          <ol class="toc__list">
+            {% for definition in section.definitions %}
+              {% include 'components/table-of-content-item.njk' %}
+            {% endfor %}
+          </ol>
+        </li>
+      {% endfor %}
     </ol>
   </nav>
 </section>
diff --git a/assets/css/base.scss b/assets/css/base.scss
index dfd5b72f..b94e9e66 100644
--- a/assets/css/base.scss
+++ b/assets/css/base.scss
@@ -206,11 +206,8 @@ th {
   grid-gap: var(--l-gap);
 }
 
-.multi-column {
-  column-count: auto;
-  column-gap: var(--l-gap);
-  column-width: var(--auto-grid-min-size);
-}
+@import './structures/multi-column';
+@import './structures/table-of-content';
 
 .small-left-grid {
   display: grid;
diff --git a/assets/css/structures/_multi-column.scss b/assets/css/structures/_multi-column.scss
new file mode 100644
index 00000000..735fb062
--- /dev/null
+++ b/assets/css/structures/_multi-column.scss
@@ -0,0 +1,5 @@
+.multi-column {
+  column-count: auto;
+  column-gap: var(--l-gap);
+  column-width: var(--auto-grid-min-size);
+}
diff --git a/assets/css/structures/_table-of-content.scss b/assets/css/structures/_table-of-content.scss
new file mode 100644
index 00000000..a459f3e0
--- /dev/null
+++ b/assets/css/structures/_table-of-content.scss
@@ -0,0 +1,3 @@
+.toc__list-item {
+  break-inside: avoid;
+}