diff --git a/assets/css/default.css b/assets/css/default.css
index 2cedcf0c..c9bb9619 100644
--- a/assets/css/default.css
+++ b/assets/css/default.css
@@ -816,3 +816,7 @@ h1, h2, h3, h4, h5, p,
 #download_widget {
     width: 100%;
 }
+.description-chapters-content-container {
+  display: flex;
+  flex-direction: row;
+}
diff --git a/src/invidious/views/components/description_chapters_widget.ecr b/src/invidious/views/components/description_chapters_widget.ecr
new file mode 100644
index 00000000..e5ecdb99
--- /dev/null
+++ b/src/invidious/views/components/description_chapters_widget.ecr
@@ -0,0 +1,27 @@
+<% if !chapters.empty? %>
+    <hr class="description-content-separator"/>
+    <div class="description-chapters-section">
+        <p class="description-chapter">
+        <h5>Chapters</h5>
+
+        <div class="description-chapters-content-container">
+            <% chapters.each do | chapter |%>
+                <div class="chapter">
+                    <a href="/watch?v=<%= video.id %>&t=<%=chapter.start_ms.milliseconds.total_seconds %>">
+                        <div class="thumbnail">
+                            <% if !env.get("preferences").as(Preferences).thin_mode %>
+                                <img loading="lazy" class="thumbnail" src="/vi/" alt="" />
+                            <%- else -%>
+                                <div class="thumbnail-placeholder"></div>
+                            <%- end -%>
+                        </div>
+
+                        <p><%= recode_length_seconds(chapter.start_ms.milliseconds.total_seconds) %></p>
+                        <p><%=chapter.title%></p>
+                    </a>
+                </div>
+            <% end %>
+        </div>
+    </div>
+    <hr class="description-content-separator"/>
+<% end %>
\ No newline at end of file
diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index 45c58a16..d18622b7 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -254,10 +254,16 @@ we're going to need to do it here in order to allow for translations.
 
             <div id="description-box"> <!-- Description -->
                 <% if video.description.size < 200 || params.extend_desc %>
-                    <div id="descriptionWrapper"><%= video.description_html %></div>
+                    <div id="descriptionWrapper">
+                        <%= video.description_html %>
+                        <%= rendered "components/description_chapters_widget" %>
+                    </div>
                 <% else %>
                     <input id="descexpansionbutton" type="checkbox"/>
-                    <div id="descriptionWrapper"><%= video.description_html %></div>
+                    <div id="descriptionWrapper">
+                        <%= video.description_html %>
+                        <%= rendered "components/description_chapters_widget" %>
+                    </div>
                     <label for="descexpansionbutton">
                         <a></a>
                     </label>