diff --git a/ts/WoltLabSuite/Core/Component/Quote/Message.ts b/ts/WoltLabSuite/Core/Component/Quote/Message.ts
index 7ca07fcc823..bd6810cfe34 100644
--- a/ts/WoltLabSuite/Core/Component/Quote/Message.ts
+++ b/ts/WoltLabSuite/Core/Component/Quote/Message.ts
@@ -11,7 +11,6 @@
 import DomUtil from "WoltLabSuite/Core/Dom/Util";
 import { getPhrase } from "WoltLabSuite/Core/Language";
 import { wheneverFirstSeen } from "WoltLabSuite/Core/Helper/Selector";
-import { set as setAlignment } from "WoltLabSuite/Core/Ui/Alignment";
 import { CKEditor } from "WoltLabSuite/Core/Component/Ckeditor";
 import {
   saveQuote,
@@ -38,6 +37,13 @@ let selectedMessage:
       container: Container;
     };
 
+interface ElementBoundaries {
+  bottom: number;
+  left: number;
+  right: number;
+  top: number;
+}
+
 const containers = new Map<string, Container>();
 const quoteMessageButtons = new Map<string, HTMLElement>();
 let activeMessageId = "";
@@ -456,7 +462,7 @@ function onMouseUp(event?: MouseEvent): void {
     copyQuote.classList.remove("touchForceInaccessible");
   }
 
-  setAlignment(copyQuote, endContainer);
+  alignQuoteButtons(content);
 
   copyQuote.classList.remove("active");
   if (wasInaccessible) {
@@ -492,3 +498,42 @@ function removeSelection(): void {
     selection.removeAllRanges();
   }
 }
+
+function alignQuoteButtons(content: HTMLElement): void {
+  const coordinates = getElementBoundaries(window.getSelection());
+  const dimensions = { height: copyQuote.offsetHeight, width: copyQuote.offsetWidth };
+  let left = (coordinates.right - coordinates.left) / 2 - dimensions.width / 2 + coordinates.left;
+
+  // Prevent the overlay from overflowing the left or right boundary of the container.
+  const containerBoundaries = content.getBoundingClientRect();
+  if (left < containerBoundaries.left) {
+    left = containerBoundaries.left;
+  } else if (left + dimensions.width > containerBoundaries.right) {
+    left = containerBoundaries.right - dimensions.width;
+  }
+
+  copyQuote.style.setProperty("top", `${coordinates.bottom + 7}px`);
+  copyQuote.style.setProperty("left", `${left}px`);
+}
+
+function getElementBoundaries(selection: Selection | null): ElementBoundaries {
+  if (!selection) {
+    throw new Error("Nothing is selected");
+  }
+
+  if (selection.rangeCount <= 0) {
+    throw new Error("Selection has no range");
+  }
+
+  // The coordinates returned by getBoundingClientRect() are relative to the
+  // viewport, not the document.
+  const rect = selection.getRangeAt(0).getBoundingClientRect();
+
+  const scrollTop = window.scrollY;
+  return {
+    bottom: rect.bottom + scrollTop,
+    left: rect.left,
+    right: rect.right,
+    top: rect.top + scrollTop,
+  };
+}
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Quote/Message.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Quote/Message.js
index e6c299521c0..d8d762edd8c 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Quote/Message.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Quote/Message.js
@@ -7,7 +7,7 @@
  * @since 6.2
  * @woltlabExcludeBundle tiny
  */
-define(["require", "exports", "tslib", "WoltLabSuite/Core/Dom/Util", "WoltLabSuite/Core/Language", "WoltLabSuite/Core/Helper/Selector", "WoltLabSuite/Core/Ui/Alignment", "WoltLabSuite/Core/Component/Quote/Storage", "WoltLabSuite/Core/Helper/PromiseMutex", "WoltLabSuite/Core/Component/Ckeditor/Event"], function (require, exports, tslib_1, Util_1, Language_1, Selector_1, Alignment_1, Storage_1, PromiseMutex_1, Event_1) {
+define(["require", "exports", "tslib", "WoltLabSuite/Core/Dom/Util", "WoltLabSuite/Core/Language", "WoltLabSuite/Core/Helper/Selector", "WoltLabSuite/Core/Component/Quote/Storage", "WoltLabSuite/Core/Helper/PromiseMutex", "WoltLabSuite/Core/Component/Ckeditor/Event"], function (require, exports, tslib_1, Util_1, Language_1, Selector_1, Storage_1, PromiseMutex_1, Event_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.registerContainer = registerContainer;
@@ -323,7 +323,7 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Dom/Util", "WoltLabSui
         if (wasInaccessible) {
             copyQuote.classList.remove("touchForceInaccessible");
         }
-        (0, Alignment_1.set)(copyQuote, endContainer);
+        alignQuoteButtons(content);
         copyQuote.classList.remove("active");
         if (wasInaccessible) {
             copyQuote.classList.add("touchForceInaccessible");
@@ -355,4 +355,37 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Dom/Util", "WoltLabSui
             selection.removeAllRanges();
         }
     }
+    function alignQuoteButtons(content) {
+        const coordinates = getElementBoundaries(window.getSelection());
+        const dimensions = { height: copyQuote.offsetHeight, width: copyQuote.offsetWidth };
+        let left = (coordinates.right - coordinates.left) / 2 - dimensions.width / 2 + coordinates.left;
+        // Prevent the overlay from overflowing the left or right boundary of the container.
+        const containerBoundaries = content.getBoundingClientRect();
+        if (left < containerBoundaries.left) {
+            left = containerBoundaries.left;
+        }
+        else if (left + dimensions.width > containerBoundaries.right) {
+            left = containerBoundaries.right - dimensions.width;
+        }
+        copyQuote.style.setProperty("top", `${coordinates.bottom + 7}px`);
+        copyQuote.style.setProperty("left", `${left}px`);
+    }
+    function getElementBoundaries(selection) {
+        if (!selection) {
+            throw new Error("Nothing is selected");
+        }
+        if (selection.rangeCount <= 0) {
+            throw new Error("Selection has no range");
+        }
+        // The coordinates returned by getBoundingClientRect() are relative to the
+        // viewport, not the document.
+        const rect = selection.getRangeAt(0).getBoundingClientRect();
+        const scrollTop = window.scrollY;
+        return {
+            bottom: rect.bottom + scrollTop,
+            left: rect.left,
+            right: rect.right,
+            top: rect.top + scrollTop,
+        };
+    }
 });