diff --git a/lib/rdoc/generator/template/aliki/css/rdoc.css b/lib/rdoc/generator/template/aliki/css/rdoc.css
index cedc0ab768..7d129d07c3 100644
--- a/lib/rdoc/generator/template/aliki/css/rdoc.css
+++ b/lib/rdoc/generator/template/aliki/css/rdoc.css
@@ -1119,6 +1119,8 @@ main .method-source-code {
 
 main .method-source-code pre {
   border-color: var(--color-accent-hover);
+  width: 100%;
+  box-sizing: border-box;
 }
 
 main .method-source-code.active-menu {
@@ -1143,6 +1145,7 @@ main .method-detail:target {
 
 main .method-header {
   display: inline-block;
+  max-width: calc(100% - 6em); /* 6em is the width of the source code toggle */
 }
 
 main .method-heading {
diff --git a/lib/rdoc/version.rb b/lib/rdoc/version.rb
index 95b56ea25d..f100e23418 100644
--- a/lib/rdoc/version.rb
+++ b/lib/rdoc/version.rb
@@ -5,6 +5,6 @@ module RDoc
   ##
   # RDoc version you are using
 
-  VERSION = '6.16.1'
+  VERSION = '6.17.0'
 
 end