diff --git a/src/frontend/app/folder/folder-update/folder-update.component.ts b/src/frontend/app/folder/folder-update/folder-update.component.ts
index e87d37c45709f280a347f40777808be30e2b0642..fd1eb8c92a20fbedd489421a96affde766fac2db 100644
--- a/src/frontend/app/folder/folder-update/folder-update.component.ts
+++ b/src/frontend/app/folder/folder-update/folder-update.component.ts
@@ -198,23 +198,24 @@ export class FolderUpdateComponent implements OnInit {
 
     selectEntity(newEntity: any) {
         if (this.holdShift) {
+            $j('#jstree').jstree('deselect_all');
             this.folder.sharing.entities = [];
-        }
-
-        if (!this.functions.empty(newEntity.keyword)) {
-            this.folder.sharing.entities.push(
-                {
-                    keyword: newEntity.keyword,
-                    edition: false
-                }
-            );
         } else {
-            this.folder.sharing.entities.push(
-                {
-                    entity_id: newEntity.serialId,
-                    edition: false
-                }
-            );
+            if (!this.functions.empty(newEntity.keyword)) {
+                this.folder.sharing.entities.push(
+                    {
+                        keyword: newEntity.keyword,
+                        edition: false
+                    }
+                );
+            } else {
+                this.folder.sharing.entities.push(
+                    {
+                        entity_id: newEntity.serialId,
+                        edition: false
+                    }
+                );
+            }
         }
     }