diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
index 17aa367e..2063a3da 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
@@ -335,8 +335,12 @@
     <button mat-menu-item (click)="onClickStatusBusy($event, 1)">
       <span class="presence pcOther"> </span>
       <ucap-inline-edit-input
-        (click)="$event.stopPropagation()"
-        (apply)="onApplyStatusMessage(1, statusMessage1.value)"
+        (apply)="
+          $event.stopPropagation();
+          onApplyStatusMessage(1, statusMessage1.value)
+        "
+        (edit)="$event.stopPropagation()"
+        (cancel)="$event.stopPropagation()"
       >
         <span ucapInlineEditInput="view">{{ loginRes?.statusMessage1 }}</span>
         <span ucapInlineEditInput="edit"
@@ -345,6 +349,7 @@
             #statusMessage1
             type="text"
             [value]="loginRes?.statusMessage1"
+            (click)="$event.stopPropagation()"
         /></span>
       </ucap-inline-edit-input>
     </button>
@@ -353,8 +358,12 @@
     <button mat-menu-item (click)="onClickStatusBusy($event, 2)">
       <span class="presence pcOther"> </span>
       <ucap-inline-edit-input
-        (click)="$event.stopPropagation()"
-        (apply)="onApplyStatusMessage(2, statusMessage2.value)"
+        (apply)="
+          $event.stopPropagation();
+          onApplyStatusMessage(2, statusMessage2.value)
+        "
+        (edit)="$event.stopPropagation()"
+        (cancel)="$event.stopPropagation()"
       >
         <span ucapInlineEditInput="view">{{ loginRes?.statusMessage2 }}</span>
         <span ucapInlineEditInput="edit"
@@ -363,6 +372,7 @@
             #statusMessage2
             type="text"
             [value]="loginRes?.statusMessage2"
+            (click)="$event.stopPropagation()"
         /></span>
       </ucap-inline-edit-input>
     </button>
@@ -371,8 +381,12 @@
     <button mat-menu-item (click)="onClickStatusBusy($event, 3)">
       <span class="presence pcOther"> </span>
       <ucap-inline-edit-input
-        (click)="$event.stopPropagation()"
-        (apply)="onApplyStatusMessage(3, statusMessage3.value)"
+        (apply)="
+          $event.stopPropagation();
+          onApplyStatusMessage(3, statusMessage3.value)
+        "
+        (edit)="$event.stopPropagation()"
+        (cancel)="$event.stopPropagation()"
       >
         <span ucapInlineEditInput="view">{{ loginRes?.statusMessage3 }}</span>
         <span ucapInlineEditInput="edit"
@@ -381,6 +395,7 @@
             #statusMessage3
             type="text"
             [value]="loginRes?.statusMessage3"
+            (click)="$event.stopPropagation()"
         /></span>
       </ucap-inline-edit-input>
     </button>
diff --git a/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.ts b/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.ts
index 56ea1bbd..633108a5 100644
--- a/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.ts
+++ b/projects/ucap-webmessenger-ui/src/lib/components/inline-edit-input.component.ts
@@ -7,7 +7,11 @@ import { Component, OnInit, Output, EventEmitter } from '@angular/core';
 })
 export class InlineEditInputComponent implements OnInit {
   @Output()
-  apply = new EventEmitter<void>();
+  edit = new EventEmitter<Event>();
+  @Output()
+  cancel = new EventEmitter<Event>();
+  @Output()
+  apply = new EventEmitter<Event>();
 
   get editMode() {
     return this._editMode;
@@ -24,14 +28,16 @@ export class InlineEditInputComponent implements OnInit {
 
   onClickEdit(event: Event) {
     this.editMode = true;
+    this.edit.emit(event);
   }
 
   onClickCancel(event: Event) {
     this.editMode = false;
+    this.cancel.emit(event);
   }
 
   onClickApply(event: Event) {
     this.editMode = false;
-    this.apply.emit();
+    this.apply.emit(event);
   }
 }