diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html
index 0106e4c0..b61747e0 100644
--- a/src/app/vault/groupings.component.html
+++ b/src/app/vault/groupings.component.html
@@ -45,7 +45,8 @@
             <li *ngFor="let f of folders" [ngClass]="{active: selectedFolder && f.id === selectedFolderId}">
                 <a href="#" appStopClick appBlurClick (click)="folder(f)">
                     <i class="fa-li fa fa-caret-right"></i> {{f.name}}
-                    <span appStopProp appStopClick (click)="editFolder(f)" title="{{'editFolder' | i18n}}">
+                    <span appStopProp appStopClick (click)="editFolder(f)" title="{{'editFolder' | i18n}}"
+                          *ngIf="f.id">
                         <i class="fa fa-pencil fa-fw"></i>
                     </span>
                 </a>
diff --git a/src/scss/vault.scss b/src/scss/vault.scss
index ea696de4..8d882c47 100644
--- a/src/scss/vault.scss
+++ b/src/scss/vault.scss
@@ -4,6 +4,15 @@
     height: 100%;
     display: flex;
 
+    #groupings, #items, #details {
+        display: flex;
+        flex-direction: column;
+
+        .inner-content {
+            padding: 10px 15px;
+        }
+    }
+
     #groupings {
         background-color: $background-color-alt;
         width: 15%;
@@ -12,7 +21,8 @@
         border-right: 1px solid $border-color-dark;
 
         .inner-content {
-            padding-bottom: 0 !important;
+            padding-bottom: 0;
+            padding-right: 5px;
         }
 
         h2 {
@@ -92,9 +102,9 @@
                 &.active {
                     background-color: darken($background-color-alt, 5%);
                     margin-left: -15px;
-                    margin-right: -15px;
+                    margin-right: -5px;
                     padding-left: 15px;
-                    padding-right: 15px;
+                    padding-right: 5px;
                 }
             }
         }
@@ -151,15 +161,6 @@
         }
     }
 
-    #groupings, #items, #details {
-        display: flex;
-        flex-direction: column;
-
-        .inner-content {
-            padding: 10px 15px;
-        }
-    }
-
     .header {
         min-height: 44px;
         max-height: 44px;