diff --git a/src/libs/ComposerUtils/index.js b/src/libs/ComposerUtils/index.js
index 2866b840874..dfe6cf44680 100644
--- a/src/libs/ComposerUtils/index.js
+++ b/src/libs/ComposerUtils/index.js
@@ -25,4 +25,21 @@ function canSkipTriggerHotkeys(isSmallScreenWidth, isKeyboardShown) {
     return (isSmallScreenWidth && DeviceCapabilities.canUseTouchScreen()) || isKeyboardShown;
 }
 
-export {getNumberOfLines, updateNumberOfLines, insertText, canSkipTriggerHotkeys};
+/**
+ * Returns the length of the common suffix between two input strings.
+ * The common suffix is the number of characters shared by both strings
+ * at the end (suffix) until a mismatch is encountered.
+ *
+ * @param {string} str1
+ * @param {string} str2
+ * @returns {number} The length of the common suffix between the strings.
+ */
+function getCommonSuffixLength(str1, str2) {
+    let i = 0;
+    while (str1[str1.length - 1 - i] === str2[str2.length - 1 - i]) {
+        i++;
+    }
+    return i;
+}
+
+export {getNumberOfLines, updateNumberOfLines, insertText, canSkipTriggerHotkeys, getCommonSuffixLength};
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 03f86205a80..4b8fa50cd54 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -797,13 +797,13 @@ class ReportActionCompose extends React.Component {
             this.debouncedUpdateFrequentlyUsedEmojis();
         }
 
-        this.setState((prevState) => {
+        this.setState(() => {
             const newState = {
                 isCommentEmpty: !!newComment.match(/^(\s)*$/),
                 value: newComment,
             };
             if (comment !== newComment) {
-                const remainder = prevState.value.slice(prevState.selection.end).length;
+                const remainder = ComposerUtils.getCommonSuffixLength(comment, newComment);
                 newState.selection = {
                     start: newComment.length - remainder,
                     end: newComment.length - remainder,