diff --git a/scm-ui-components/packages/ui-components/src/repos/DiffFile.js b/scm-ui-components/packages/ui-components/src/repos/DiffFile.js
index f268940709..c483feecba 100644
--- a/scm-ui-components/packages/ui-components/src/repos/DiffFile.js
+++ b/scm-ui-components/packages/ui-components/src/repos/DiffFile.js
@@ -19,6 +19,10 @@ const styles = {
   panel: {
     fontSize: "1rem"
   },
+  /* remove bottom border for collapsed panels */
+  panelCollapsed: {
+    borderBottom: "none"
+  },
   /* breaks into a second row
      when buttons and title become too long */
   level: {
@@ -283,7 +287,7 @@ class DiffFile extends React.Component<Props, State> {
       ? fileControlFactory(file, this.setCollapse)
       : null;
     return (
-      <div className={classNames("panel", classes.panel)}>
+      <div className={classNames("panel", classes.panel, collapsed ? classes.panelCollapsed : "")}>
         <div className="panel-heading">
           <div className={classNames("level", classes.level)}>
             <div