diff --git a/src/frontend/app/actions/actions-list.component.html b/src/frontend/app/actions/actions-list.component.html
index 6652d7a6fae77bb0bef5713419ed7eeefc0c529d..565bcf3d075d2ae3317d027c3320535094a078df 100644
--- a/src/frontend/app/actions/actions-list.component.html
+++ b/src/frontend/app/actions/actions-list.component.html
@@ -6,11 +6,11 @@
     [style.top]="contextMenuPosition.y"></span>
 
 <mat-menu #menu="matMenu">
-    <div style="text-align: center;font-size: 10px;opacity: 0.5;margin-top:-15px;">
-        <ng-container *ngIf="!contextMode || (contextMode && this.selectedRes.length > 0)">
+    <div style="text-align: center;font-size: 10px;opacity: 0.5;margin-top:-15px;padding:5px;">
+        <ng-container *ngIf="!contextMode || (contextMode && this.selectedRes.length > 1)">
             {{selectedRes.length}} {{lang.selectedElements}}
         </ng-container>
-        <ng-container *ngIf="contextMode && this.selectedRes.length == 0">
+        <ng-container *ngIf="contextMode && this.selectedRes.length == 1">
             {{this.contextMenuTitle}}
         </ng-container>
     </div>
diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html
index bf8fbad878fa94f2ab62c0fbd08835c0623528be..56a41ae901d26277fa07e92471ac3c904e607b7b 100644
--- a/src/frontend/app/list/basket-list.component.html
+++ b/src/frontend/app/list/basket-list.component.html
@@ -72,11 +72,11 @@
                             <!-- Primary Info Line -->
                             <div class="resultRow newRow" [class.resultRow-mobile]="mobileMode">
                                 <div *ngIf="!mobileMode" class="checkThis">
-                                    <mat-checkbox color="primary" [checked]="row.checked" (change)="toggleRes($event,row.res_id)"
+                                    <mat-checkbox color="primary" [checked]="row.checked" (change)="toggleRes($event,row)"
                                         (click)="$event.stopPropagation();"></mat-checkbox>
                                 </div>
                                 <div class="resultCol" [class]="data.cssClasses.join(' ')" *ngFor="let data of displayedMainData"
-                                    (click)="launchEvent();" style="cursor: pointer;">
+                                     style="cursor: pointer;">
                                     <span *ngIf="data.value == 'alt_identifier'">
                                         <mat-icon [ngStyle]="{'color': row.priorityColor}" color="primary" class="{{row.statusImage.charAt(0)}}{{row.statusImage.charAt(1)}} {{row.statusImage}} {{row.statusImage.charAt(0)}}{{row.statusImage.charAt(1)}}-2x"
                                             title="{{row.statusLabel}}" style="cursor: crosshair;" (click)="$event.stopPropagation();filterThis(row.statusLabel)"></mat-icon><br />
diff --git a/src/frontend/app/list/basket-list.component.ts b/src/frontend/app/list/basket-list.component.ts
index 4e5530b48ed31c52152fa060fee2a1158a4a2c8a..e9186d4acc62ffec9aa3782a13389be9643b2b0f 100755
--- a/src/frontend/app/list/basket-list.component.ts
+++ b/src/frontend/app/list/basket-list.component.ts
@@ -327,14 +327,16 @@ export class BasketListComponent implements OnInit {
         return data;
     }
 
-    toggleRes(e: any, resId: any) {
+    toggleRes(e: any, row: any) {
         if (e.checked) {
-            if (this.selectedRes.indexOf(resId) === -1) {
-                this.selectedRes.push(resId);
+            if (this.selectedRes.indexOf(row.res_id) === -1) {
+                this.selectedRes.push(row.res_id);
+                row.checked = true;
             }
         } else {
-            let index = this.selectedRes.indexOf(resId);
+            let index = this.selectedRes.indexOf(row.res_id);
             this.selectedRes.splice(index, 1);
+            row.checked = false;
         }
     }
 
@@ -353,7 +355,11 @@ export class BasketListComponent implements OnInit {
     }
 
     open({ x, y }: MouseEvent, row: any) {
-    
+        let thisSelect = { checked : true };
+        let thisDeselect = { checked : false };
+        row.checked = true;
+        this.toggleAllRes(thisDeselect);
+        this.toggleRes(thisSelect, row);
         this.actionsList.open(x, y, row)
 
         // prevents default