diff --git a/projects/common/components/marking-bar/marking-bar.component.ts b/projects/common/components/marking-bar/marking-bar.component.ts
index 22b109342de70f391bdc9ebc7c2a51c5c1d6703d..d76bff458f796de2bab0b44ed1d02b4c9143dd74 100644
--- a/projects/common/components/marking-bar/marking-bar.component.ts
+++ b/projects/common/components/marking-bar/marking-bar.component.ts
@@ -36,13 +36,11 @@ import { TextElement } from '../../ui-elements/text/text-element';
   ]
 })
 export class MarkingBarComponent {
-  @Input() element!: HTMLElement;
   @Input() elementModel!: TextElement;
   @Output() applySelection = new EventEmitter<{
     active: boolean,
     mode: 'mark' | 'delete',
-    color: string,
-    element: HTMLElement
+    color: string
   }>();
 
   selectedColor!: string;
@@ -51,7 +49,7 @@ export class MarkingBarComponent {
     this.selectedColor = selection.selected ? selection.color : 'none';
     this.applySelection
       .emit({
-        active: selection.selected, mode: selection.mode, color: selection.color, element: this.element
+        active: selection.selected, mode: selection.mode, color: selection.color
       });
   }
 }
diff --git a/projects/common/ui-elements/text/text.component.ts b/projects/common/ui-elements/text/text.component.ts
index 57df22f82a77e3af7c61a19508fca78302145f11..d7f6e3443e48a5c6cef37ea1d98bc4ef92c3cdcd 100644
--- a/projects/common/ui-elements/text/text.component.ts
+++ b/projects/common/ui-elements/text/text.component.ts
@@ -16,11 +16,10 @@ import { ValueChangeElement } from '../../models/uI-element';
           *ngIf="elementModel.highlightableYellow ||
            elementModel.highlightableTurquoise ||
            elementModel.highlightableOrange"
-          [element]="container"
           [elementModel]="elementModel"
           (applySelection)="applySelection.emit($event)">
       </app-marking-bar>
-      <div #container class="text-container"
+      <div #textContainerRef class="text-container"
            [style.background-color]="elementModel.surfaceProps.backgroundColor"
            [style.color]="elementModel.fontProps.fontColor"
            [style.font-family]="elementModel.fontProps.font"
@@ -51,9 +50,8 @@ export class TextComponent extends ElementComponent {
   @Output() applySelection = new EventEmitter<{
     active: boolean,
     mode: 'mark' | 'delete',
-    color: string,
-    element: HTMLElement
+    color: string
   }>();
 
-  @ViewChild('container') containerDiv!: ElementRef;
+  @ViewChild('textContainerRef') textContainerRef!: ElementRef;
 }
diff --git a/projects/player/src/app/components/element-container/element-container.component.ts b/projects/player/src/app/components/element-container/element-container.component.ts
index 86751c2cc98b7e0853a32c394d5afebdd61bfe15..eb63512fa63073da14dc7bb51ccc785ae25c37ef 100644
--- a/projects/player/src/app/components/element-container/element-container.component.ts
+++ b/projects/player/src/app/components/element-container/element-container.component.ts
@@ -193,8 +193,8 @@ export class ElementContainerComponent implements OnInit {
   private stopSelection(mouseEvent: MouseEvent, elementComponent: TextComponent) {
     const selection = window.getSelection();
     if (selection) {
-      if (!this.markingService.isDescendantOf(selection.anchorNode, elementComponent.containerDiv.nativeElement) ||
-        !this.markingService.isDescendantOf(selection.focusNode, elementComponent.containerDiv.nativeElement) ||
+      if (!this.markingService.isDescendantOf(selection.anchorNode, elementComponent.textContainerRef.nativeElement) ||
+        !this.markingService.isDescendantOf(selection.focusNode, elementComponent.textContainerRef.nativeElement) ||
       (mouseEvent.ctrlKey && selection.rangeCount)) {
         selection.removeAllRanges();
       } else if (this.selectedMode && this.selectedColor) {
@@ -202,7 +202,7 @@ export class ElementContainerComponent implements OnInit {
           .applySelection(
             this.selectedMode,
             this.selectedColor,
-            elementComponent.containerDiv.nativeElement,
+            elementComponent.textContainerRef.nativeElement,
             elementComponent as TextComponent
           );
       }
@@ -218,13 +218,15 @@ export class ElementContainerComponent implements OnInit {
           active: boolean,
           mode: 'mark' | 'delete',
           color: string;
-          element: HTMLElement;
         }) => {
           if (selection.active) {
             this.selectedColor = selection.color;
             this.selectedMode = selection.mode;
             this.markingService
-              .applySelection(selection.mode, selection.color, selection.element, elementComponent as TextComponent);
+              .applySelection(selection.mode,
+                selection.color,
+                elementComponent.textContainerRef.nativeElement,
+                elementComponent as TextComponent);
           } else {
             this.selectedColor = null;
             this.selectedMode = null;