diff --git a/VDS/Components/Tooltip/TooltipDialog.swift b/VDS/Components/Tooltip/TooltipDialog.swift
index 3a8826b3..d04a173b 100644
--- a/VDS/Components/Tooltip/TooltipDialog.swift
+++ b/VDS/Components/Tooltip/TooltipDialog.swift
@@ -210,22 +210,18 @@ open class TooltipDialog: View, UIScrollViewDelegate {
     lazy var primaryAccessibilityElement = UIAccessibilityElement(accessibilityContainer: self).with {
         $0.accessibilityLabel = "Tooltip"
         $0.accessibilityValue = "expanded"
+        $0.accessibilityFrameInContainerSpace = .init(origin: .zero, size: .init(width: fullWidth, height: VDSLayout.Spacing.space1X.value))
     }
     
     open override func updateAccessibility() {
         super.updateAccessibility()
         
-        primaryAccessibilityElement.accessibilityFrameInContainerSpace = .init(origin: .zero, size: .init(width: bounds.width, height: VDSLayout.Spacing.space1X.value))
         primaryAccessibilityElement.accessibilityHint = "Click on the \(closeButtonText) button to close."
+        
+        var elements: [Any] = [primaryAccessibilityElement]
+        contentStackView.arrangedSubviews.forEach{ elements.append($0) }
+        elements.append(closeButton)
+        accessibilityElements = elements
     }
 
-    override public var accessibilityElements: [Any]? {
-        get {
-            var elements: [Any] = []//[primaryAccessibilityElement]
-            contentStackView.arrangedSubviews.forEach{ elements.append($0) }
-            elements.append(closeButton)
-            return elements
-        }
-        set {}
-    }
 }