diff --git a/Sources/FioriSwiftUICore/_FioriStyles/CardFooterStyle.fiori.swift b/Sources/FioriSwiftUICore/_FioriStyles/CardFooterStyle.fiori.swift
index d3a0f7580..8992b4194 100644
--- a/Sources/FioriSwiftUICore/_FioriStyles/CardFooterStyle.fiori.swift
+++ b/Sources/FioriSwiftUICore/_FioriStyles/CardFooterStyle.fiori.swift
@@ -197,7 +197,7 @@ private struct CardFooterLayout: Layout {
         
         let y = maxHeight / 2
         // Move the hidden buttons out of visible area
-        let hideRect = CGRect(x: -2000, y: y, width: 0, height: 0)
+        let hideRect = CGRect(x: finalWidth + 0.3, y: y, width: 0.3, height: 0.3)
         var frames = [CGRect]()
         
         var x: CGFloat = 0
@@ -293,6 +293,7 @@ public struct CardFooterBaseStyle: CardFooterStyle {
                 configuration.action
             }
         }
+        .clipped()
     }
     
     /**