diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue
index 849b590a3c42781b012462b0a4dd5ebe5eafd7a3..c8a6f4d457df10ac645046fd0d7c9f2663f46f98 100644
--- a/app/assets/javascripts/diffs/components/diff_file.vue
+++ b/app/assets/javascripts/diffs/components/diff_file.vue
@@ -420,7 +420,14 @@ export default {
       :show-local-file-reviews="showLocalFileReviews"
       :pinned="isPinnedFile"
       class="js-file-title file-title gl-border-1 gl-border-solid gl-border-gray-100"
-      :class="[hasBodyClasses.header, { 'gl-border-red-500! gl-bg-red-200!': file.conflict_type }]"
+      :class="[
+        hasBodyClasses.header,
+        {
+          'gl-border-red-500! gl-bg-red-200!': file.conflict_type,
+          'gl-rounded-bottom-left-none! gl-rounded-bottom-right-none!':
+            file.conflict_type && isCollapsed,
+        },
+      ]"
       @toggleFile="handleToggle({ viaUserInteraction: true })"
       @showForkMessage="showForkMessage"
     />