diff --git a/src/renderer/components/+entity-settings/entity-settings.tsx b/src/renderer/components/+entity-settings/entity-settings.tsx
index ee543490eb..5f5ff6bd43 100644
--- a/src/renderer/components/+entity-settings/entity-settings.tsx
+++ b/src/renderer/components/+entity-settings/entity-settings.tsx
@@ -110,7 +110,7 @@ export class EntitySettings extends React.Component<Props> {
         <Tabs className="flex column" scrollable={false} onChange={this.onTabChange} value={this.activeTab}>
           { groups.map((group, groupIndex) => (
             <React.Fragment key={`group-${groupIndex}`}>
-              <hr/>
+              {groupIndex > 0 && <hr/>}
               <div className="header">{group[0]}</div>
               { group[1].map((setting, index) => (
                 <Tab
diff --git a/src/renderer/components/layout/setting-layout.scss b/src/renderer/components/layout/setting-layout.scss
index 03472f5579..4fd61bfa93 100644
--- a/src/renderer/components/layout/setting-layout.scss
+++ b/src/renderer/components/layout/setting-layout.scss
@@ -50,7 +50,7 @@
 
     .sidebar {
       width: 218px;
-      padding: 60px 0 60px 20px;
+      padding: 60px 10px 60px 20px;
 
       h2 {
         font-size: 15px;
@@ -68,10 +68,6 @@
         margin-right: 20px;
         height: 1px;
         border-top: thin solid var(--hrColor);
-
-        &:first-child {
-          display: none;
-        }
       }
 
       .Tabs {
@@ -79,7 +75,6 @@
           padding: 6px 10px;
           font-size: 13px;
           font-weight: 800;
-          line-height: 16px;
           text-transform: uppercase;
           color: var(--textColorPrimary);
 
@@ -92,14 +87,10 @@
           padding: 6px 10px;
           margin-bottom: 2px;
           border-radius: 4px;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          overflow: hidden;
           font-size: 15px;
           line-height: 20px;
           cursor: pointer;
-          border-top-right-radius: 0;
-          border-bottom-right-radius: 0;
+          white-space: normal;
 
           &::after {
             content: none;