From 3b87f9f69b7ea6e382c600a1fd74c447a3ec3ee8 Mon Sep 17 00:00:00 2001
From: Stephen Abello <stephen.abello@combodo.com>
Date: Fri, 28 Aug 2026 09:34:00 +0200
Subject: [PATCH] Fix compose popup menu when there's extra actions

---
 .../layout/activity-panel/_activity-action.scss    |  7 +++----
 .../base/layouts/activity-panel/layout.html.twig   | 14 +++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/css/backoffice/layout/activity-panel/_activity-action.scss b/css/backoffice/layout/activity-panel/_activity-action.scss
index 39d518ded6..f8f22e72bb 100644
--- a/css/backoffice/layout/activity-panel/_activity-action.scss
+++ b/css/backoffice/layout/activity-panel/_activity-action.scss
@@ -31,10 +31,9 @@ $ibo-activity-panel--activity-action-separator--background-color: $ibo-color-gre
   &.ibo-is-hidden{
     display: none;
   }
-}
-
-.ibo-activity-panel--add-caselog-entry-button  ~ .ibo-activity-panel--activity-actions {
-  top: calc(#{$ibo-activity-panel--activity-actions--top} + #{$ibo-activity-panel--add-caselog-entry-button--diameter} + #{$ibo-activity-panel--activity-actions--gap});
+  &:has(+ .ibo-activity-panel--add-caselog-entry-button) {
+    top: calc(#{$ibo-activity-panel--activity-actions--top} + #{$ibo-activity-panel--activity-action--diameter} + #{$ibo-activity-panel--activity-actions--gap});
+  }
 }
 
 .ibo-activity-panel--activity-action {
diff --git a/templates/base/layouts/activity-panel/layout.html.twig b/templates/base/layouts/activity-panel/layout.html.twig
index 8c92b8dd90..dcfc7d776f 100644
--- a/templates/base/layouts/activity-panel/layout.html.twig
+++ b/templates/base/layouts/activity-panel/layout.html.twig
@@ -71,6 +71,13 @@
             </div>
         </div>
     </div>
+    {% if oUIBlock.HasActivityActions() %}
+        <div class="ibo-activity-panel--activity-actions" data-role="ibo-activity-panel--activity-actions">
+            {% for oActivityAction in oUIBlock.GetActivityActions() %}
+                {{ render_block(oActivityAction) }}
+            {% endfor %}
+        </div>
+    {% endif %}
     {% if oUIBlock.IsComposeButtonEnabled() %}
         <a href="#"
            id="ibo-activity-panel--add-caselog-entry-button"
@@ -84,13 +91,6 @@
             {{ render_block(oUIBlock.GetComposeMenu()) }}
         {% endif %}
     {% endif %}
-    {% if oUIBlock.HasActivityActions() %}
-        <div class="ibo-activity-panel--activity-actions" data-role="ibo-activity-panel--activity-actions">
-            {% for oActivityAction in oUIBlock.GetActivityActions() %}
-                {{ render_block(oActivityAction) }}
-            {% endfor %}
-        </div>
-    {% endif %}
     <div class="ibo-activity-panel--body" data-role="ibo-activity-panel--body">
         {% if oUIBlock.GetGroupedEntries()|length > 0 %}
             {% for aEntryGroup in oUIBlock.GetGroupedEntries() %}