diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 6ac4ec6ea0dc5851d75d423754d1fffa54b74b1b..b512da0939fcb358f4510f2fa40a5537782877f3 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -43,7 +43,7 @@ ul.notes {
     }
 
     .system-note-message {
-      display: inline;
+      display: inline-block;
 
       &::first-letter {
         text-transform: lowercase;
@@ -55,7 +55,7 @@ ul.notes {
       }
 
       p {
-        display: inline;
+        display: inline-block;
         margin: 0;
 
         &::first-letter {
@@ -151,10 +151,6 @@ ul.notes {
         }
       }
     }
-
-    .note-headline-light {
-      display: inline;
-    }
   }
 
   .discussion-body {
@@ -452,11 +448,6 @@ ul.notes {
   border-radius: $border-radius-base;
 }
 
-.diff-file .note .note-actions {
-  right: 0;
-  top: 0;
-}
-
 
 /**
  * Line note button on the side of diffs
@@ -590,3 +581,19 @@ ul.notes {
     }
   }
 }
+
+// Merge request notes in diffs
+.diff-file {
+
+  // Diff is side by side
+  .notes_content.parallel .note-header .note-headline-light {
+    display: block;
+    position: relative;
+  }
+
+  // Diff is inline
+  .notes_content .note-header .note-headline-light {
+    display: inline-block;
+    position: relative;
+  }
+}
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 778a32e63453659ace9b284ead7ffa9542397620..399cf85cd0f3c747372833e8f3fce21fa88a8d5e 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -10,7 +10,7 @@
     .timeline-content
       .note-header
         = link_to_member(note.project, note.author, avatar: false)
-        .inline.note-headline-light
+        .note-headline-light
           = note.author.to_reference
           - unless note.system
             commented
diff --git a/changelogs/unreleased/25930-discussion-actions-overlap-header-text.yml b/changelogs/unreleased/25930-discussion-actions-overlap-header-text.yml
new file mode 100644
index 0000000000000000000000000000000000000000..54a461c24edaf594f2cd8014f3dbd03a6a3de00d
--- /dev/null
+++ b/changelogs/unreleased/25930-discussion-actions-overlap-header-text.yml
@@ -0,0 +1,4 @@
+---
+title: Fix discussion overlap text in regular screens
+merge_request: 8273
+author: