diff --git a/lib/widgets/common/grid/header.dart b/lib/widgets/common/grid/header.dart
index 0bc1db5ad..3acf4c2af 100644
--- a/lib/widgets/common/grid/header.dart
+++ b/lib/widgets/common/grid/header.dart
@@ -36,7 +36,7 @@ class SectionHeader extends StatelessWidget {
       padding: padding,
       constraints: BoxConstraints(minHeight: leadingDimension),
       child: GestureDetector(
-        onTap: () => _toggleSectionSelection(context),
+        onTap: selectable ? () => _toggleSectionSelection(context) : null,
         child: Text.rich(
           TextSpan(
             children: [
@@ -53,7 +53,7 @@ class SectionHeader extends StatelessWidget {
                             child: leading,
                           )
                       : null,
-                  onPressed: () => _toggleSectionSelection(context),
+                  onPressed: selectable ? () => _toggleSectionSelection(context) : null,
                 ),
               ),
               TextSpan(
diff --git a/lib/widgets/common/scaling.dart b/lib/widgets/common/scaling.dart
index 6e74ed431..10b479fc1 100644
--- a/lib/widgets/common/scaling.dart
+++ b/lib/widgets/common/scaling.dart
@@ -1,4 +1,3 @@
-import 'dart:math';
 import 'dart:ui' as ui;
 
 import 'package:aves/theme/durations.dart';
@@ -153,7 +152,11 @@ class _GridScaleGestureDetectorState<T> extends State<GridScaleGestureDetector<T
     final appBarHeight = widget.appBarHeightNotifier.value;
     final scrollOffset = tileRect.top + (tileRect.height - scrollableHeight) / 2 + appBarHeight;
 
-    PrimaryScrollController.of(context)?.jumpTo(max(.0, scrollOffset));
+    final controller = PrimaryScrollController.of(context);
+    if (controller != null) {
+      final maxScrollExtent = controller.position.maxScrollExtent;
+      controller.jumpTo(scrollOffset.clamp(.0, maxScrollExtent));
+    }
   }
 }