diff --git a/lib/widgets/album/empty.dart b/lib/widgets/album/empty.dart
index 0f19e03b0..d36d81f0a 100644
--- a/lib/widgets/album/empty.dart
+++ b/lib/widgets/album/empty.dart
@@ -6,7 +6,7 @@ class EmptyContent extends StatelessWidget {
   Widget build(BuildContext context) {
     const color = Color(0xFF607D8B);
     return Align(
-      alignment: const FractionalOffset(.5, .4),
+      alignment: const FractionalOffset(.5, .3),
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: const [
diff --git a/lib/widgets/album/thumbnail_collection.dart b/lib/widgets/album/thumbnail_collection.dart
index 4f38953d3..64caa9e07 100644
--- a/lib/widgets/album/thumbnail_collection.dart
+++ b/lib/widgets/album/thumbnail_collection.dart
@@ -50,13 +50,15 @@ class ThumbnailCollection extends StatelessWidget {
                 final scrollView = CustomScrollView(
                   key: _scrollableKey,
                   primary: true,
+                  // workaround to prevent scrolling the app bar away
+                  // when there is no content and we use `SliverFillRemaining`
+                  physics: collection.isEmpty ? const NeverScrollableScrollPhysics() : null,
                   slivers: [
                     if (appBar != null) appBar,
                     if (collection.isEmpty && emptyBuilder != null)
-                      SliverFillViewport(
-                        delegate: SliverChildListDelegate.fixed(
-                          [emptyBuilder(context)],
-                        ),
+                      SliverFillRemaining(
+                        child: emptyBuilder(context),
+                        hasScrollBody: false,
                       ),
                     ...sectionKeys.map((sectionKey) => SectionSliver(
                           collection: collection,