diff --git a/package-lock.json b/package-lock.json
index 920dec5ad..2c9776157 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6062,15 +6062,6 @@
             "p-try": "^2.0.0"
           }
         },
-        "serialize-javascript": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
-          "dev": true,
-          "requires": {
-            "randombytes": "^2.1.0"
-          }
-        },
         "ssri": {
           "version": "8.0.0",
           "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz",
@@ -7048,24 +7039,24 @@
       "dev": true
     },
     "elliptic": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
           "dev": true
         }
       }
@@ -18444,6 +18435,15 @@
         }
       }
     },
+    "serialize-javascript": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
+    },
     "serve-index": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
@@ -19977,9 +19977,9 @@
           }
         },
         "serialize-javascript": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
           "dev": true,
           "requires": {
             "randombytes": "^2.1.0"
@@ -21212,9 +21212,9 @@
           },
           "dependencies": {
             "serialize-javascript": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-              "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+              "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
               "dev": true,
               "requires": {
                 "randombytes": "^2.1.0"
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 505a1d050..78bb63303 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -77,6 +77,7 @@ import {NgxMaterialTimepickerModule} from 'ngx-material-timepicker';
 // tslint:disable-next-line: max-line-length
 import { TechnologyReportTableComponent } from './modules/technology-report/components/technology-report-table/technology-report-table.component';
 import { TechnologyReportComponent } from './modules/technology-report/pages/technology-report.component';
+import { ModalDialogModule } from 'ngx-modal-dialog';
 
 const maskConfig: Partial<IConfig> = {
   validation: false,
@@ -144,6 +145,7 @@ const maskConfig: Partial<IConfig> = {
     AutocompleteLibModule,
     NgxMaterialTimepickerModule,
     UiSwitchModule,
+    ModalDialogModule.forRoot(),
     StoreModule.forRoot(reducers, {
       metaReducers,
     }),
diff --git a/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.html b/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.html
index 8279155e5..affe558e4 100644
--- a/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.html
+++ b/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.html
@@ -8,6 +8,7 @@
         formControlName="name"
         placeholder="Customer name"
         [class.is-invalid]="customerForm.invalid && customerForm.touched"
+        (input)="onSearchChange($event.target.value)"
         required
       />
       <span
@@ -23,6 +24,7 @@
         rows="3"
         formControlName="description"
         placeholder="Customer description"
+        (input)="onSearchChange($event.target.value)"
       ></textarea>
     </div>
       <button type="submit" class="btn btn-primary" [disabled]="!customerForm.valid">Save</button>
diff --git a/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.ts b/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.ts
index 9cb14ae8d..09261f1e2 100644
--- a/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.ts
+++ b/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.ts
@@ -23,6 +23,8 @@ import { LoadCustomerProjects, CleanCustomerProjects } from '../../../projects/c
 export class CreateCustomerComponent implements OnInit, OnDestroy {
   customerForm: FormGroup;
   @Input() areTabsActive: boolean;
+  @Input() haveChanges: boolean;
+  @Output() ishaveChanges = new EventEmitter<boolean>();
   @Output() changeValueAreTabsActives = new EventEmitter<boolean>();
   @Output() closeCustomerComponent = new EventEmitter<boolean>();
   customerToEdit: Customer;
@@ -68,6 +70,7 @@ export class CreateCustomerComponent implements OnInit, OnDestroy {
       this.store.dispatch(new LoadProjectTypes(customerData.id));
       this.store.dispatch(new LoadCustomerProjects(customerData.id));
       this.changeValueAreTabsActives.emit(true);
+      this.ishaveChanges.emit(this.haveChanges = false);
       this.customerForm.setValue({
         name: customerData.name,
         description: customerData.description,
@@ -94,4 +97,14 @@ export class CreateCustomerComponent implements OnInit, OnDestroy {
     this.store.dispatch(new ResetCustomerToEdit());
     this.closeCustomerComponent.emit(false);
   }
+
+  onSearchChange(searchValue: string): void {
+    if (searchValue) {
+      this.haveChanges = true;
+      this.ishaveChanges.emit(this.haveChanges);
+    } else {
+      this.haveChanges = false;
+      this.ishaveChanges.emit(this.haveChanges);
+    }
+  }
 }
diff --git a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html
index 09b7a0b76..1dac6429b 100644
--- a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html
+++ b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html
@@ -20,12 +20,28 @@
         <td class="col-3 text-break">{{ customer.name }}</td>
         <td class="col-4 text-center">
           <button
+            data-toggle="modal"
             (click)="editCustomer(customer.id)"
             type="button"
+            data-target="#editModal"
             class="btn btn-sm btn-primary"
           >
-            <i class="fa fa-pencil fa-xs"></i>
+            <i class="fa fa-pencil fa-xs">{{ haveChanges}}</i>
           </button>
+
+          <app-dialog
+            *ngIf="showModal"
+            class="modal fade"
+            id="editModal"
+            tabindex="-1"
+            role="dialog"
+            aria-hidden="true"
+            [title]="'Edit Customer'"
+            [body]="message"
+            (closeModalEvent)="discardChanges(customer.id)"
+            >
+          </app-dialog>
+
           <button
             data-toggle="modal"
             data-target="#deleteModal"
@@ -52,4 +68,4 @@
   [body]="message"
   (closeModalEvent)="deleteCustomer()"
 >
-</app-dialog>
+</app-dialog>
\ No newline at end of file
diff --git a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts
index e5c9785ed..885032d83 100644
--- a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts
+++ b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts
@@ -20,6 +20,7 @@ import { ResetProjectTypeToEdit } from '../../../projects-type/store';
 })
 export class CustomerListComponent implements OnInit, OnDestroy, AfterViewInit {
   @Input() showCustomerForm: boolean;
+  @Input() haveChanges: boolean;
   @Output() changeValueShowCustomerForm = new EventEmitter<boolean>();
   @Input()
   customers: Customer[] = [];
@@ -31,6 +32,7 @@ export class CustomerListComponent implements OnInit, OnDestroy, AfterViewInit {
   changeCustomerSubscription: Subscription;
   showModal = false;
   idToDelete: string;
+  idToEdit: string;
   message: string;
   isLoading$: Observable<boolean>;
 
@@ -77,10 +79,24 @@ export class CustomerListComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   editCustomer(customerId: string) {
+    if (this.haveChanges === true) {
+      this.message = `Do you have changes in a client, do you want to discard them?`;
+      this.showModal = true;
+    } else {
+      this.showCustomerForm = true;
+      this.showModal = false;
+      this.changeValueShowCustomerForm.emit(this.showCustomerForm);
+      this.resetProjectFieldsToEdit();
+      this.store.dispatch(new SetCustomerToEdit(customerId));
+    }
+  }
+
+  discardChanges(customerId: string) {
     this.showCustomerForm = true;
+    this.showModal = false;
     this.changeValueShowCustomerForm.emit(this.showCustomerForm);
-    this.store.dispatch(new SetCustomerToEdit(customerId));
     this.resetProjectFieldsToEdit();
+    this.store.dispatch(new SetCustomerToEdit(customerId));
   }
 
   private resetProjectFieldsToEdit() {
@@ -109,5 +125,4 @@ export class CustomerListComponent implements OnInit, OnDestroy, AfterViewInit {
     this.message = `Are you sure you want to delete ${item.name}?`;
     this.showModal = true;
   }
-
 }
diff --git a/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.html b/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.html
index d80e31e81..889ff6451 100644
--- a/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.html
+++ b/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.html
@@ -55,6 +55,7 @@ <h4 class="navbar-brand nav-title">{{customerName}}</h4>
       <app-create-customer
         [areTabsActive]="areTabsActive"
         (changeValueAreTabsActives)="activeTabs($event)"
+        (ishaveChanges)="getChangesInputs($event)"
         (closeCustomerComponent)="closeCustomer($event)"
       ></app-create-customer>
     </div>
diff --git a/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.ts b/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.ts
index 83caacb26..7b8902e2f 100644
--- a/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.ts
+++ b/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.ts
@@ -10,7 +10,9 @@ import { Component, Output, EventEmitter, OnInit } from '@angular/core';
 })
 export class ManagementCustomerProjectsComponent implements OnInit {
   @Output() closeCustemerForm = new EventEmitter<boolean>();
+  @Output() sendChanges = new EventEmitter<boolean>();
   areTabsActive: boolean;
+  haveChanges: boolean;
   activeTab: string;
   customerName: string;
 
@@ -42,4 +44,10 @@ export class ManagementCustomerProjectsComponent implements OnInit {
     this.activeTab = activeTab;
   }
 
+  getChangesInputs($haveChanges: boolean) {
+    setTimeout(() => {
+      this.haveChanges = $haveChanges;
+      this.sendChanges.emit($haveChanges);
+    }, 1);
+  }
 }
diff --git a/src/app/modules/customer-management/pages/customer.component.html b/src/app/modules/customer-management/pages/customer.component.html
index a97e5d8aa..07b9c16f8 100644
--- a/src/app/modules/customer-management/pages/customer.component.html
+++ b/src/app/modules/customer-management/pages/customer.component.html
@@ -6,11 +6,12 @@
   </div>
   <app-customer-list
     [showCustomerForm]="showCustomerForm"
+    [haveChanges]="haveChanges"
     (changeValueShowCustomerForm)="showCustomerForm = $event"
   ></app-customer-list>
   <div class="row" *ngIf="showCustomerForm">
     <div class="col">
-      <app-management-customer-projects (closeCustemerForm)="closeCustomerForm($event)"></app-management-customer-projects>
+      <app-management-customer-projects (sendChanges)="getChangesInputs($event)" (closeCustemerForm)="closeCustomerForm($event)"></app-management-customer-projects>
     </div>
   </div>
 </div>
diff --git a/src/app/modules/customer-management/pages/customer.component.ts b/src/app/modules/customer-management/pages/customer.component.ts
index 10958f525..204c1ba69 100644
--- a/src/app/modules/customer-management/pages/customer.component.ts
+++ b/src/app/modules/customer-management/pages/customer.component.ts
@@ -1,7 +1,7 @@
 import { Store } from '@ngrx/store';
 import { Customer } from 'src/app/modules/shared/models';
 import { SetCustomerToEdit } from 'src/app/modules/customer-management/store';
-import { Component } from '@angular/core';
+import { Component, Output, EventEmitter } from '@angular/core';
 
 @Component({
   selector: 'app-customer',
@@ -10,6 +10,8 @@ import { Component } from '@angular/core';
 })
 export class CustomerComponent {
   showCustomerForm = false;
+  haveChanges = false;
+
   activityName: string;
 
   constructor(private store: Store<Customer>) { }
@@ -21,4 +23,9 @@ export class CustomerComponent {
   closeCustomerForm(event) {
     this.showCustomerForm = event;
   }
+
+  getChangesInputs(event) {
+    this.haveChanges = event;
+  }
+
 }
diff --git a/src/app/modules/time-entries/pages/time-entries.component.ts b/src/app/modules/time-entries/pages/time-entries.component.ts
index 21a89ccb8..1be347419 100644
--- a/src/app/modules/time-entries/pages/time-entries.component.ts
+++ b/src/app/modules/time-entries/pages/time-entries.component.ts
@@ -165,4 +165,5 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
     this.message = `Are you sure you want to delete ${item.activity_name}?`;
     this.showModal = true;
   }
-}
\ No newline at end of file
+
+}