diff --git a/sass/homeassistant/_overrides.scss b/sass/homeassistant/_overrides.scss
index 186de47ee16..97c66c0c1c5 100644
--- a/sass/homeassistant/_overrides.scss
+++ b/sass/homeassistant/_overrides.scss
@@ -1390,13 +1390,15 @@ a.my {
 // Prevent headings from disappearing behind the site header when linked to
 h1, h2, h3, h4, h5, h6 {
   position: relative;
+  word-wrap: break-word;
 }
 
 :target {
   display: block;
-  position: absolute;
+  position: relative;
   top: -100px;
   visibility: hidden;
+  scroll-margin-top: 80px;
 }
 
 .site-header {