diff --git a/src/app/pages/accounts/account-details/account-details.component.html b/src/app/pages/accounts/account-details/account-details.component.html
index 6f646d2..8d9b7b6 100644
--- a/src/app/pages/accounts/account-details/account-details.component.html
+++ b/src/app/pages/accounts/account-details/account-details.component.html
@@ -228,7 +228,7 @@
 
       <mat-tab-group *ngIf="account" dynamicHeight mat-align-tabs="start">
         <mat-tab label="Transactions">
-          <app-transaction-details [transaction]="transaction"></app-transaction-details>
+          <app-transaction-details [transaction]="transaction" (closeWindow)="transaction = $event"></app-transaction-details>
           <div class="card mt-1">
             <div class="card-header">
               <div class="row">
@@ -257,12 +257,12 @@
 
                 <ng-container matColumnDef="sender">
                   <th mat-header-cell *matHeaderCellDef mat-sort-header> Sender </th>
-                  <td mat-cell *matCellDef="let transaction"> {{transaction?.sender?.vcard.fn[0].value}} </td>
+                  <td mat-cell *matCellDef="let transaction"> {{transaction?.sender?.vcard.fn[0].value || transaction.from}} </td>
                 </ng-container>
 
                 <ng-container matColumnDef="recipient">
                   <th mat-header-cell *matHeaderCellDef mat-sort-header> Recipient </th>
-                  <td mat-cell *matCellDef="let transaction"> {{transaction?.recipient?.vcard.fn[0].value}} </td>
+                  <td mat-cell *matCellDef="let transaction"> {{transaction?.recipient?.vcard.fn[0].value || transaction.to}} </td>
                 </ng-container>
 
                 <ng-container matColumnDef="value">
diff --git a/src/app/pages/transactions/transaction-details/transaction-details.component.html b/src/app/pages/transactions/transaction-details/transaction-details.component.html
index 39f90e1..fb1c6b0 100644
--- a/src/app/pages/transactions/transaction-details/transaction-details.component.html
+++ b/src/app/pages/transactions/transaction-details/transaction-details.component.html
@@ -3,7 +3,7 @@
     <mat-card-title class="card-header">
       <div class="row">
         TRANSACTION DETAILS
-        <button mat-raised-button type="button" class="btn btn-outline-secondary ml-auto mr-2" (click)="transaction = null"> CLOSE </button>
+        <button mat-raised-button type="button" class="btn btn-outline-secondary ml-auto mr-2" (click)="close()"> CLOSE </button>
       </div>
     </mat-card-title>
     <div *ngIf="transaction.type == 'transaction'" class="card-body">
diff --git a/src/app/pages/transactions/transaction-details/transaction-details.component.ts b/src/app/pages/transactions/transaction-details/transaction-details.component.ts
index fded333..e6efb47 100644
--- a/src/app/pages/transactions/transaction-details/transaction-details.component.ts
+++ b/src/app/pages/transactions/transaction-details/transaction-details.component.ts
@@ -1,4 +1,11 @@
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { Router } from '@angular/router';
 import { TransactionService } from '@app/_services';
 import { copyToClipboard } from '@app/_helpers';
@@ -13,6 +20,9 @@ import { strip0x } from '@src/assets/js/ethtx/dist/hex';
 })
 export class TransactionDetailsComponent implements OnInit {
   @Input() transaction;
+
+  @Output() closeWindow: EventEmitter<any> = new EventEmitter<any>();
+
   senderBloxbergLink: string;
   recipientBloxbergLink: string;
   traderBloxbergLink: string;
@@ -62,4 +72,9 @@ export class TransactionDetailsComponent implements OnInit {
       this.snackBar.open(address + ' copied successfully!', 'Close', { duration: 3000 });
     }
   }
+
+  close(): void {
+    this.transaction = null;
+    this.closeWindow.emit(this.transaction);
+  }
 }
diff --git a/src/app/pages/transactions/transactions.component.html b/src/app/pages/transactions/transactions.component.html
index 1d4adc8..2099255 100644
--- a/src/app/pages/transactions/transactions.component.html
+++ b/src/app/pages/transactions/transactions.component.html
@@ -22,7 +22,7 @@
         </mat-card-title>
         <div class="card-body">
 
-          <app-transaction-details [transaction]="transaction"></app-transaction-details>
+          <app-transaction-details [transaction]="transaction" (closeWindow)="transaction = $event"></app-transaction-details>
 
           <div class="row card-header">
             <mat-form-field appearance="outline">
@@ -53,7 +53,7 @@
 
             <ng-container matColumnDef="recipient">
               <th mat-header-cell *matHeaderCellDef mat-sort-header> Recipient </th>
-              <td mat-cell *matCellDef="let transaction"> {{transaction?.recipient?.vcard.fn[0].value || transaction.to }} </td>
+              <td mat-cell *matCellDef="let transaction"> {{transaction?.recipient?.vcard.fn[0].value || transaction.to}} </td>
             </ng-container>
 
             <ng-container matColumnDef="value">