diff --git a/src/app/vault/folder-add-edit.component.html b/src/app/vault/folder-add-edit.component.html
index 7462039d..0fcf314d 100644
--- a/src/app/vault/folder-add-edit.component.html
+++ b/src/app/vault/folder-add-edit.component.html
@@ -4,7 +4,7 @@
             <div class="modal-body">
                 <div class="box">
                     <div class="box-header">
-                        {{'addFolder' | i18n}}
+                        {{title}}
                     </div>
                     <div class="box-content">
                         <div class="box-content-row" appBoxRow>
diff --git a/src/app/vault/folder-add-edit.component.ts b/src/app/vault/folder-add-edit.component.ts
index 826258ce..d57bd72a 100644
--- a/src/app/vault/folder-add-edit.component.ts
+++ b/src/app/vault/folder-add-edit.component.ts
@@ -27,6 +27,7 @@ export class FolderAddEditComponent implements OnInit {
 
     editMode: boolean = false;
     folder: FolderView = new FolderView();
+    title: string;
 
     constructor(private folderService: FolderService, private i18nService: I18nService,
         private analytics: Angulartics2, private toasterService: ToasterService) { }
@@ -36,8 +37,11 @@ export class FolderAddEditComponent implements OnInit {
 
         if (this.editMode) {
             this.editMode = true;
+            this.title = this.i18nService.t('editFolder');
             const folder = await this.folderService.get(this.folderId);
             this.folder = await folder.decrypt();
+        } else {
+            this.title = this.i18nService.t('addFolder');
         }
     }