diff --git a/app/client/packages/design-system/ads/src/List/List.styles.tsx b/app/client/packages/design-system/ads/src/List/List.styles.tsx
index 14fcd957fb..c42bdd78ee 100644
--- a/app/client/packages/design-system/ads/src/List/List.styles.tsx
+++ b/app/client/packages/design-system/ads/src/List/List.styles.tsx
@@ -42,10 +42,6 @@ export const RightControlWrapper = styled.div`
   line-height: normal;
   display: flex;
   align-items: center;
-
-  button {
-    margin-left: -4px;
-  }
 `;
 
 export const TopContentWrapper = styled.div`
@@ -110,11 +106,22 @@ export const StyledListItem = styled.div<{
     ${RightControlWrapper} {
       visibility: hidden;
       width: 0;
+
+      button.entity-context-menu {
+        visibility: hidden;
+        height: 100%;
+        width: 100%;
+      }
     }
 
     &:hover ${RightControlWrapper} {
       visibility: visible;
       width: auto;
+
+      button.entity-context-menu {
+        visibility: visible;
+        width: 24px;
+      }
     }
   }
 
diff --git a/app/client/packages/design-system/ads/src/Templates/EntityContextMenu/EntityContextMenu.styles.ts b/app/client/packages/design-system/ads/src/Templates/EntityContextMenu/EntityContextMenu.styles.ts
index 0faae06bd5..aafa3b0967 100644
--- a/app/client/packages/design-system/ads/src/Templates/EntityContextMenu/EntityContextMenu.styles.ts
+++ b/app/client/packages/design-system/ads/src/Templates/EntityContextMenu/EntityContextMenu.styles.ts
@@ -9,4 +9,6 @@ export const MenuContent = styled(ADSMenuContent)`
 
 export const ButtonContainer = styled.div`
   position: relative;
+  width: 100%;
+  height: 100%;
 `;