diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index 51cb6c6ca7..6e54122ade 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -113,7 +113,7 @@ export class AddEditComponent implements OnChanges {
             this.cipher = await cipher.decrypt();
         } else {
             this.cipher = new CipherView();
-            this.cipher.folderId = null; // TODO
+            this.cipher.folderId = this.folderId;
             this.cipher.type = CipherType.Login;
             this.cipher.login = new LoginView();
             this.cipher.card = new CardView();
diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html
index 8a099e8512..504c63dbc1 100644
--- a/src/app/vault/ciphers.component.html
+++ b/src/app/vault/ciphers.component.html
@@ -11,17 +11,17 @@
 </div>
 <div class="content">
     <div class="list">
-        <a *ngFor="let cipher of ciphers" appStopClick (click)="cipherClicked(cipher)"
-           href="#" title="{{'viewItem' | i18n}}">
-            <app-vault-icon [cipher]="cipher"></app-vault-icon>
+        <a *ngFor="let c of ciphers" appStopClick (click)="cipherClicked(c)"
+           href="#" title="{{'viewItem' | i18n}}" [ngClass]="{'active': c.id === activeCipherId}">
+            <app-vault-icon [cipher]="c"></app-vault-icon>
             <span class="text">
-                {{cipher.name}}
-                <i class="fa fa-share-alt text-muted" *ngIf="cipher.organizationId"
+                {{c.name}}
+                <i class="fa fa-share-alt text-muted" *ngIf="c.organizationId"
                    title="{{'shared' | i18n}}"></i>
-                <i class="fa fa-paperclip text-muted" *ngIf="cipher.attachments"
+                <i class="fa fa-paperclip text-muted" *ngIf="c.hasAttachments"
                    title="{{'attachments' | i18n}}"></i>
             </span>
-            <span class="detail">{{cipher.subTitle}}</span>
+            <span class="detail">{{c.subTitle}}</span>
         </a>
     </div>
 </div>
diff --git a/src/app/vault/ciphers.component.ts b/src/app/vault/ciphers.component.ts
index 3856c9ac94..b0a3a34836 100644
--- a/src/app/vault/ciphers.component.ts
+++ b/src/app/vault/ciphers.component.ts
@@ -17,6 +17,7 @@ import { CipherService } from 'jslib/abstractions/cipher.service';
     template: template,
 })
 export class CiphersComponent implements OnInit {
+    @Input() activeCipherId: string = null;
     @Output() onCipherClicked = new EventEmitter<CipherView>();
     @Output() onAddCipher = new EventEmitter();
 
diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html
index f709c96eee..d7c365a04d 100644
--- a/src/app/vault/vault.component.html
+++ b/src/app/vault/vault.component.html
@@ -7,6 +7,7 @@
                          (onCollectionClicked)="filterCollection($event.id)">
     </app-vault-groupings>
     <app-vault-ciphers id="items"
+                       [activeCipherId]="cipherId"
                        (onCipherClicked)="viewCipher($event)"
                        (onAddCipher)="addCipher($event)">
     </app-vault-ciphers>
@@ -17,7 +18,7 @@
     </app-vault-view>
     <app-vault-add-edit id="details"
                         *ngIf="action === 'add' || action === 'edit'"
-                        [folderId]="null"
+                        [folderId]="action === 'add' && folderId !== 'none' ? folderId : null"
                         [cipherId]="action === 'edit' ? cipherId : null"
                         (onSavedCipher)="savedCipher($event)"
                         (onDeletedCipher)="deletedCipher($event)"
diff --git a/src/scss/list.scss b/src/scss/list.scss
index 441e0f8d2e..a0e1becf69 100644
--- a/src/scss/list.scss
+++ b/src/scss/list.scss
@@ -34,11 +34,16 @@
         background-color: $list-item-hover;
     }
 
-    &:not(:hover):focus {
+    &.active {
         border-left: 5px solid $brand-primary;
         padding-left: 5px;
     }
 
+    &:focus:not(.active) {
+        border-left: 5px solid $text-muted;
+        padding-left: 5px;
+    }
+
     .text, .detail {
         white-space: nowrap;
         overflow: hidden;