diff --git a/lib/screens/shared/media/chapter_row.dart b/lib/screens/shared/media/chapter_row.dart
index 9fc6505..923268a 100644
--- a/lib/screens/shared/media/chapter_row.dart
+++ b/lib/screens/shared/media/chapter_row.dart
@@ -84,7 +84,10 @@ class ChapterRow extends ConsumerWidget {
               child: Padding(
                 padding: const EdgeInsets.all(5),
                 child: Container(
-                  color: Theme.of(context).colorScheme.surfaceContainer,
+                  decoration: BoxDecoration(
+                    borderRadius: FladderTheme.smallShape.borderRadius,
+                    color: Theme.of(context).colorScheme.surfaceContainer.withValues(alpha: 0.75),
+                  ),
                   child: Padding(
                     padding: const EdgeInsets.all(5),
                     child: Text(
@@ -99,9 +102,9 @@ class ChapterRow extends ConsumerWidget {
           ],
           focusedOverlays: [
             if (AdaptiveLayout.inputDeviceOf(context) == InputDevice.pointer)
-              ExcludeFocus(
-                child: Align(
-                  alignment: Alignment.bottomRight,
+              Align(
+                alignment: Alignment.bottomRight,
+                child: ExcludeFocus(
                   child: PopupMenuButton(
                     tooltip: context.localized.options,
                     icon: const Icon(
diff --git a/lib/util/focus_provider.dart b/lib/util/focus_provider.dart
index 17e6ef0..17ecc36 100644
--- a/lib/util/focus_provider.dart
+++ b/lib/util/focus_provider.dart
@@ -179,19 +179,17 @@ class FocusButtonState extends State<FocusButton> {
                   onTap: widget.onTap,
                   onSecondaryTapDown: widget.onSecondaryTapDown,
                   onLongPress: widget.onLongPress,
-                  child: Stack(
-                    children: [
-                      if (widget.child != null) widget.child!,
-                    ],
-                  ),
+                  child: widget.child,
                   overlays: [
                     if (widget.overlays.isNotEmpty) ...widget.overlays,
                     if (widget.focusedOverlays.isNotEmpty)
-                      AnimatedOpacity(
-                        opacity: value ? 1 : 0,
-                        duration: const Duration(milliseconds: 250),
-                        child: Stack(
-                          children: [...widget.focusedOverlays],
+                      Positioned.fill(
+                        child: AnimatedOpacity(
+                          opacity: value ? 1 : 0,
+                          duration: const Duration(milliseconds: 250),
+                          child: Stack(
+                            children: [...widget.focusedOverlays],
+                          ),
                         ),
                       ),
                   ],