diff --git a/src/app/components/context-menu/context-menu-outside-event.directive.ts b/src/app/components/context-menu/context-menu-outside-event.directive.ts
index 8c8674fb2..89572647b 100644
--- a/src/app/components/context-menu/context-menu-outside-event.directive.ts
+++ b/src/app/components/context-menu/context-menu-outside-event.directive.ts
@@ -15,7 +15,7 @@ export class OutsideEventDirective implements OnInit, OnDestroy {
 
     ngOnInit() {
         this.subscriptions = this.subscriptions.concat([
-            fromEvent(document, 'click')
+            fromEvent(document.body, 'click')
                 .pipe(delay(1))
                 .subscribe(() => this.clickOutside.next())
         ]);
diff --git a/src/app/components/context-menu/context-menu.directive.ts b/src/app/components/context-menu/context-menu.directive.ts
index 6b4fcd26e..ee489952b 100644
--- a/src/app/components/context-menu/context-menu.directive.ts
+++ b/src/app/components/context-menu/context-menu.directive.ts
@@ -68,7 +68,7 @@ export class ContextActionsDirective {
     ) { }
 
     private execute(event: MouseEvent) {
-        const selected = this.getSelectedRow();
+        const selected = this.getSelectedRow(event);
 
         if (selected) {
             if (!this.isInSelection(selected)) {
@@ -108,7 +108,7 @@ export class ContextActionsDirective {
             row.getValue('name') === selected.entry.name);
     }
 
-    private getSelectedRow(): DataRow {
+    private getSelectedRow(event): DataRow {
         const rowElement = this.findAncestor(<HTMLElement>event.target, 'adf-datatable-row');
 
         if (!rowElement) {