diff --git a/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.html b/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.html
index 77f6f697d087aace9ddc40658e1730bf9574dc5a..b8e360b56c22457031a722cfbbd12c3af9e203b6 100644
--- a/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.html
+++ b/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.html
@@ -1,7 +1,6 @@
 <form [formGroup]="form"
       [dlcmAutoScrollIntoView]="!navigationResId"
       (keydown.tab)="closeByTab()"
-      (keydown.enter)="select(getFocusedResource)"
       (keydown.shift.tab)="closeByTab()">
   <div class="input">
     <mat-form-field class="form-field">
diff --git a/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.ts b/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.ts
index 50c073ba8f07871a6de3062c055754b71833caa9..54d3ce1e0385733ce3689023e8d7cc8f709d5ec7 100644
--- a/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.ts
+++ b/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.ts
@@ -16,6 +16,7 @@ import {
 } from "rxjs";
 import {
   BaseResourceType,
+  isNotNullNorUndefined,
   ObservableUtil,
   ResourceStateModel,
 } from "solidify-frontend";
@@ -44,11 +45,13 @@ export class SharedSearchableMultiSelectContentPresentational<TResource extends
   }
 
   select(value: TResource): void {
-    if (this.isActive(value)) {
-      this._valueRemovedBS.next(value);
-      return;
+    if (isNotNullNorUndefined(value)) {
+      if (this.isActive(value)) {
+        this._valueRemovedBS.next(value);
+        return;
+      }
+      this._valueAddedBS.next(value);
     }
-    this._valueAddedBS.next(value);
   }
 }