diff --git a/discord/ui/action_row.py b/discord/ui/action_row.py
index dbe455462..9868bfbc2 100644
--- a/discord/ui/action_row.py
+++ b/discord/ui/action_row.py
@@ -65,10 +65,11 @@ if TYPE_CHECKING:
     from ..emoji import Emoji
     from ..components import SelectOption
     from ..interactions import Interaction
+    from .container import Container
 
     SelectCallbackDecorator = Callable[[ItemCallbackType['S', BaseSelectT]], BaseSelectT]
 
-S = TypeVar('S', bound=Union['ActionRow', 'LayoutView'], covariant=True)
+S = TypeVar('S', bound=Union['ActionRow', 'Container', 'LayoutView'], covariant=True)
 V = TypeVar('V', bound='LayoutView', covariant=True)
 
 __all__ = ('ActionRow',)
diff --git a/discord/ui/button.py b/discord/ui/button.py
index a2c0c117f..f80065963 100644
--- a/discord/ui/button.py
+++ b/discord/ui/button.py
@@ -45,10 +45,11 @@ if TYPE_CHECKING:
 
     from .view import BaseView
     from .action_row import ActionRow
+    from .container import Container
     from ..emoji import Emoji
     from ..types.components import ButtonComponent as ButtonComponentPayload
 
-S = TypeVar('S', bound='Union[BaseView, ActionRow]', covariant=True)
+S = TypeVar('S', bound='Union[BaseView, Container, ActionRow]', covariant=True)
 V = TypeVar('V', bound='BaseView', covariant=True)