diff --git a/res/css/views/rooms/_EditMessageComposer.scss b/res/css/views/rooms/_EditMessageComposer.scss
index cc5a3c7a48..39feccad58 100644
--- a/res/css/views/rooms/_EditMessageComposer.scss
+++ b/res/css/views/rooms/_EditMessageComposer.scss
@@ -16,12 +16,14 @@ limitations under the License.
 */
 
 .mx_EditMessageComposer {
+    --EditMessageComposer-padding-inline: 3px;
+
     display: flex;
     flex-direction: column;
     max-width: 100%; // disable overflow
     width: auto;
     gap: 5px;
-    padding: 3px;
+    padding: 3px var(--EditMessageComposer-padding-inline);
 
     .mx_BasicMessageComposer_input {
         border-radius: 4px;
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index ad865a40f4..d8da3117bd 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -260,6 +260,13 @@ $left-gutter: 64px;
         .mx_ReplyTile .mx_EventTileBubble {
             left: unset; // Cancel the value specified above for the tile inside ReplyTile
         }
+
+        &.mx_EventTile_isEditing > .mx_EventTile_line {
+            .mx_EditMessageComposer {
+                // add space for the stroke on box-shadow
+                padding-inline-start: calc($selected-message-border-width + var(--EditMessageComposer-padding-inline));
+            }
+        }
     }
 
     &[data-layout=group] {