diff --git a/common/components/domain.py b/common/components/domain.py
index 3baeadb..d9b0d48 100644
--- a/common/components/domain.py
+++ b/common/components/domain.py
@@ -248,7 +248,9 @@ def GameStatusSelector(game, game_statuses, csrf_token: str) -> Node:
     toggle = Element(
         "button",
         [("type", "button"), ("data-toggle", ""), ("class", _SELECTOR_TOGGLE_CLASS)],
-        [current_label, Icon("arrowdown")],
+        Span(class_="flex flex-row gap-4 justify-between items-center")[
+            current_label, Icon("arrowdown")
+        ],
     )
     menu = Div(data_menu="", hidden=True, class_=_SELECTOR_MENU_CLASS)[Ul()[*options]]
     dropdown = Div(
@@ -286,7 +288,9 @@ def SessionDeviceSelector(session, session_devices, csrf_token: str) -> Node:
     toggle = Element(
         "button",
         [("type", "button"), ("data-toggle", ""), ("class", _SELECTOR_TOGGLE_CLASS)],
-        [Span(data_label="")[current_name], Icon("arrowdown")],
+        Span(class_="flex flex-row gap-4 justify-between items-center")[
+            Span(data_label="")[current_name], Icon("arrowdown")
+        ],
     )
     menu = Div(data_menu="", hidden=True, class_=_SELECTOR_MENU_CLASS)[Ul()[*options]]
     dropdown = Div(
diff --git a/games/views/game.py b/games/views/game.py
index 6e7756a..34aad34 100644
--- a/games/views/game.py
+++ b/games/views/game.py
@@ -386,13 +386,15 @@ def _played_row(game: Game, request: HttpRequest) -> Node:
         [
             ("type", "button"),
             ("data-toggle", ""),
-            ("class", _PLAYED_BTN + " rounded-e-lg relative"),
+            ("class", _PLAYED_BTN + " rounded-e-lg"),
         ],
-        [Icon("arrowdown"), menu],
+        [Icon("arrowdown")],
     )
-    group = Div(class_="inline-flex rounded-md shadow-2xs relative")[
-        count_button, toggle
-    ]
+    # Menu is a SIBLING of the toggle (not nested inside it): a <button> may not
+    # contain another <button>, and that invalid nesting makes the HTML parser
+    # close ancestors early, ejecting later page sections from their container.
+    toggle_group = Div(class_="relative")[toggle, menu]
+    group = Div(class_="inline-flex rounded-md shadow-2xs")[count_button, toggle_group]
     return custom_element(
         "play-event-row",
         PlayEventRowProps(