diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 0cdc45a..e569420 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -1,9 +1,10 @@
+import { StopPropagateClickDirective } from './utils/stop-propagate-click.directive';
 import { PagesizeComponent } from './partials/pagesize/pagesize.component';
 import { PagingComponent } from './partials/paging/paging.component';
 import { DomainsOperation } from './operations/domains.operations';
 import { PasswordOperation } from './operations/password.operations';
 import { AuthGuard } from './services/auth-guard.service';
-import { FocusDirective } from './utils/Focus.directive';
+import { FocusDirective } from './utils/focus.directive';
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
@@ -46,7 +47,8 @@ import { SelectComponent } from './partials/select/select.component';
     PagesizeComponent,
     EditSlaveComponent,
     EditAuthComponent,
-    SelectComponent
+    SelectComponent,
+    StopPropagateClickDirective
   ],
   imports: [
     BrowserModule,
diff --git a/frontend/src/app/pages/domains/domains.component.html b/frontend/src/app/pages/domains/domains.component.html
index aad2428..1b426d6 100644
--- a/frontend/src/app/pages/domains/domains.component.html
+++ b/frontend/src/app/pages/domains/domains.component.html
@@ -39,7 +39,7 @@
                         <td>{{ domain.type }}</td>
                         <td>{{ domain.records }}</td>
                         <td *ngIf="gs.isAdmin">
-                            <app-fa-icon class="cursor-pointer" icon="trash" (click)="onDeleteDomain(domain)"></app-fa-icon>
+                            <app-fa-icon class="cursor-pointer" icon="trash" appStopPropagateClick (click)="onDeleteDomain(domain)"></app-fa-icon>
                         </td>
                     </tr>
                 </tbody>
diff --git a/frontend/src/app/pages/password/password.component.ts b/frontend/src/app/pages/password/password.component.ts
index b5c649d..8d86c32 100644
--- a/frontend/src/app/pages/password/password.component.ts
+++ b/frontend/src/app/pages/password/password.component.ts
@@ -1,5 +1,5 @@
 import { PasswordOperation } from './../../operations/password.operations';
-import { PasswordValidationUtil } from './../../utils/PasswordValidation.util';
+import { PasswordValidationUtil } from './../../utils/password-validation.util';
 import { FormGroup, Validators, FormBuilder } from '@angular/forms';
 import { Component, OnInit } from '@angular/core';
 
diff --git a/frontend/src/app/utils/Focus.directive.ts b/frontend/src/app/utils/focus.directive.ts
similarity index 100%
rename from frontend/src/app/utils/Focus.directive.ts
rename to frontend/src/app/utils/focus.directive.ts
diff --git a/frontend/src/app/utils/PasswordValidation.util.ts b/frontend/src/app/utils/password-validation.util.ts
similarity index 100%
rename from frontend/src/app/utils/PasswordValidation.util.ts
rename to frontend/src/app/utils/password-validation.util.ts
diff --git a/frontend/src/app/utils/stop-propagate-click.directive.ts b/frontend/src/app/utils/stop-propagate-click.directive.ts
new file mode 100644
index 0000000..7eb0cff
--- /dev/null
+++ b/frontend/src/app/utils/stop-propagate-click.directive.ts
@@ -0,0 +1,11 @@
+import { Directive, HostListener } from '@angular/core';
+
+@Directive({
+    selector: '[appStopPropagateClick]'
+})
+export class StopPropagateClickDirective {
+    @HostListener('click', ['$event'])
+    public onClick(event: any): void {
+        event.stopPropagation();
+    }
+}