diff --git a/client/src/app/dashboard/label-dialog/label-dialog.component.html b/client/src/app/dashboard/label-dialog/label-dialog.component.html
index b24ab3a0..7a80a511 100644
--- a/client/src/app/dashboard/label-dialog/label-dialog.component.html
+++ b/client/src/app/dashboard/label-dialog/label-dialog.component.html
@@ -4,7 +4,7 @@ <h2 mat-dialog-title>Add Label</h2>
 	<form class="mat-dialog-content" #formControl="ngForm">
 		<div class="form">
 			<mat-form-field color="primary">
-				<input matInput #input class="form-control" placeholder="Label name" [(ngModel)]="labelName" name="labelName" required> 
+				<input matInput #input class="form-control" (keydown.enter)="onKeydown($event)" placeholder="Label name" [(ngModel)]="labelName" name="labelName" required> 
 				<mat-error *ngIf="formControl.invalid">{{getErrorMessage()}}</mat-error>
 			 </mat-form-field>
 		</div>
diff --git a/client/src/app/dashboard/label-dialog/label-dialog.component.ts b/client/src/app/dashboard/label-dialog/label-dialog.component.ts
index a66b8253..4b7c6c44 100644
--- a/client/src/app/dashboard/label-dialog/label-dialog.component.ts
+++ b/client/src/app/dashboard/label-dialog/label-dialog.component.ts
@@ -36,6 +36,12 @@ export class LabelDialogComponent implements OnInit {
 
   onCloseCancelLabel() {
     this.thislabelDialogRef.close('CancelLabel');
-
   }
+
+  onKeydown(event) {
+    this.thislabelDialogRef.close({
+      status: 'Add',
+      labelName: this.labelName
+      });
+    }
 }
diff --git a/client/src/app/dashboard/table-all/table-all.component.ts b/client/src/app/dashboard/table-all/table-all.component.ts
index f57264f8..5b3ea881 100644
--- a/client/src/app/dashboard/table-all/table-all.component.ts
+++ b/client/src/app/dashboard/table-all/table-all.component.ts
@@ -92,20 +92,19 @@ export class TableAllComponent implements OnInit {
         });
 
         dialogRef.afterClosed().subscribe(result => {
-            console.log('delete state', instance.instanceState);
+
             if (result === 'Confirm' && instance.instanceState === 'Running') {
-                console.log('alert working');
                 alert('Please Stop the Instance before you try to delete');
-                console.log('data', this.dataSource.data);
-
             } else {
                 if (result !== 'Cancel') {
                     this.apiService.deleteInstance(id).subscribe((deleteResult: HttpEvent<number>) => {
-                        console.log('result', deleteResult);
+                        this.removeAt(i);
                     }, err => {
                         console.log('error delete Instance', err);
+                        if (err.status === 400) {
+                            alert('Cannot delete this instance, other running instances are depending on it');
+                        }
                     });
-                    this.removeAt(i);
                 }
              }
             this.dialogResult = result;