diff --git a/src/app/shared/object-collection/shared/dso-element-decorator.ts b/src/app/shared/object-collection/shared/dso-element-decorator.ts
index 5dc085d3a7..51aa57bc50 100644
--- a/src/app/shared/object-collection/shared/dso-element-decorator.ts
+++ b/src/app/shared/object-collection/shared/dso-element-decorator.ts
@@ -3,15 +3,18 @@ import { ListableObject } from './listable-object.model';
 import { ViewMode } from '../../../+search-page/search-options.model';
 
 const dsoElementMap = new Map();
-export function renderElementsFor(listable: GenericConstructor<ListableObject>, viewMode : ViewMode) {
+export function renderElementsFor(listable: GenericConstructor<ListableObject>, viewMode: ViewMode) {
   return function decorator(objectElement: any) {
     if (!objectElement) {
       return;
     }
-    dsoElementMap.set(listable+viewMode, objectElement);
+    if (!dsoElementMap.get(viewMode)) {
+      dsoElementMap.set(viewMode, new Map());
+    }
+    dsoElementMap.get(viewMode).set(listable, objectElement);
   };
 }
 
-export function rendersDSOType(listable: GenericConstructor<ListableObject>, viewMode : ViewMode) {
-  return dsoElementMap.get(listable+viewMode);
+export function rendersDSOType(listable: GenericConstructor<ListableObject>, viewMode: ViewMode) {
+  return dsoElementMap.get(viewMode).get(listable);
 }