diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js
index 0b04c3a885be..1295fc0946b0 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js
@@ -6,6 +6,7 @@ import Text from '../../Text';
 import variables from '../../../styles/variables';
 import themeColors from '../../../styles/themes/default';
 import styles from '../../../styles/styles';
+import editedLabelStyles from '../../../styles/editedLabelStyles';
 
 const propTypes = {
     ...htmlRendererPropTypes,
@@ -20,9 +21,10 @@ const EditedRenderer = (props) => {
             {...defaultRendererProps}
             fontSize={variables.fontSizeSmall}
             color={themeColors.textSupporting}
+            style={[styles.alignItemsBaseline, editedLabelStyles]}
         >
             {/* Native devices do not support margin between nested text */}
-            <Text style={styles.w1}>{' '}</Text>
+            <Text style={[styles.w1, styles.userSelectNone]}>{' '}</Text>
             {props.translate('reportActionCompose.edited')}
         </Text>
     );
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index a47ff6d4de4e..4f275491ffe9 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -275,6 +275,18 @@ class ReportActionItem extends Component {
                 <Hoverable>
                     {hovered => (
                         <View accessibilityLabel={this.props.translate('accessibilityHints.chatMessage')}>
+                            <MiniReportActionContextMenu
+                                reportID={this.props.report.reportID}
+                                reportAction={this.props.action}
+                                isArchivedRoom={ReportUtils.isArchivedRoom(this.props.report)}
+                                displayAsGroup={this.props.displayAsGroup}
+                                isVisible={
+                                    hovered
+                                    && !this.props.draftMessage
+                                }
+                                draftMessage={this.props.draftMessage}
+                                isChronosReport={ReportUtils.chatIncludesChronos(this.props.report)}
+                            />
                             {this.props.shouldDisplayNewMarker && (
                                 <UnreadActionIndicator reportActionID={this.props.action.reportActionID} />
                             )}
@@ -336,19 +348,6 @@ class ReportActionItem extends Component {
                                         )}
                                 </OfflineWithFeedback>
                             </View>
-                            <MiniReportActionContextMenu
-                                reportID={this.props.report.reportID}
-                                reportAction={this.props.action}
-                                isArchivedRoom={ReportUtils.isArchivedRoom(this.props.report)}
-                                displayAsGroup={this.props.displayAsGroup}
-                                isVisible={
-                                    hovered
-                                    && !this.props.draftMessage
-                                    && !hasErrors
-                                }
-                                draftMessage={this.props.draftMessage}
-                                isChronosReport={ReportUtils.chatIncludesChronos(this.props.report)}
-                            />
                         </View>
                     )}
                 </Hoverable>
diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js
index 98bb819c20a7..66c7561146a5 100644
--- a/src/pages/home/report/ReportActionItemFragment.js
+++ b/src/pages/home/report/ReportActionItemFragment.js
@@ -18,6 +18,7 @@ import * as StyleUtils from '../../../styles/StyleUtils';
 import {withNetwork} from '../../../components/OnyxProvider';
 import CONST from '../../../CONST';
 import applyStrikethrough from '../../../components/HTMLEngineProvider/applyStrikethrough';
+import editedLabelStyles from '../../../styles/editedLabelStyles';
 
 const propTypes = {
     /** The message fragment needing to be displayed */
@@ -133,8 +134,10 @@ const ReportActionItemFragment = (props) => {
                     <Text
                         fontSize={variables.fontSizeSmall}
                         color={themeColors.textSupporting}
+                        style={[styles.alignItemsBaseline, editedLabelStyles]}
                     >
-                        {` ${props.translate('reportActionCompose.edited')}`}
+                        <Text style={[styles.w1, styles.userSelectNone]}>{' '}</Text>
+                        {props.translate('reportActionCompose.edited')}
                     </Text>
                     )}
                 </Text>
diff --git a/src/styles/editedLabelStyles/index.js b/src/styles/editedLabelStyles/index.js
new file mode 100644
index 000000000000..172dcc152b74
--- /dev/null
+++ b/src/styles/editedLabelStyles/index.js
@@ -0,0 +1,3 @@
+import display from '../utilities/display';
+
+export default {...display.dInlineFlex};
diff --git a/src/styles/editedLabelStyles/index.native.js b/src/styles/editedLabelStyles/index.native.js
new file mode 100644
index 000000000000..ff8b4c56321a
--- /dev/null
+++ b/src/styles/editedLabelStyles/index.native.js
@@ -0,0 +1 @@
+export default {};
diff --git a/src/styles/utilities/display.js b/src/styles/utilities/display.js
index 9e7e4107a937..bcef1c6b565f 100644
--- a/src/styles/utilities/display.js
+++ b/src/styles/utilities/display.js
@@ -20,6 +20,11 @@ export default {
     dInline: {
         display: 'inline',
     },
+
+    dInlineFlex: {
+        display: 'inline-flex',
+    },
+
     dBlock: {
         display: 'block',
     },