diff --git a/res/css/views/right_panel/_BaseCard.scss b/res/css/views/right_panel/_BaseCard.scss
index 64cb0c74f4..1ea320a04e 100644
--- a/res/css/views/right_panel/_BaseCard.scss
+++ b/res/css/views/right_panel/_BaseCard.scss
@@ -15,11 +15,12 @@ limitations under the License.
 */
 
 .mx_BaseCard {
+    --BaseCard_padding-inline: $spacing-8;
     --BaseCard_EventTile_line-padding-block: 2px;
     --BaseCard_EventTile-spacing-inline: 36px; // TODO: Use a spacing variable
     --BaseCard_header-button-size: 24px;
 
-    padding: 0 $spacing-8;
+    padding: 0 var(--BaseCard_padding-inline);
     overflow: hidden;
     display: flex;
     flex-direction: column;
diff --git a/res/css/views/right_panel/_TimelineCard.scss b/res/css/views/right_panel/_TimelineCard.scss
index 4b69d0baef..f9671c74f4 100644
--- a/res/css/views/right_panel/_TimelineCard.scss
+++ b/res/css/views/right_panel/_TimelineCard.scss
@@ -37,6 +37,10 @@ limitations under the License.
                 z-index: auto; // enable background color on hover
             }
 
+            &.mx_EventTile_info .mx_MessageActionBar {
+                inset-inline-end: calc($container-gap-width + var(--BaseCard_padding-inline) + 1px); // 1px: border width
+            }
+
             .mx_ReactionsRow {
                 position: relative; // display on hover
             }