diff --git a/mobile/lib/modules/album/ui/album_viewer_appbar.dart b/mobile/lib/modules/album/ui/album_viewer_appbar.dart
index 996e25d0ff..b1a8d4c549 100644
--- a/mobile/lib/modules/album/ui/album_viewer_appbar.dart
+++ b/mobile/lib/modules/album/ui/album_viewer_appbar.dart
@@ -211,8 +211,8 @@ class AlbumViewerAppbar extends HookConsumerWidget
           return SafeArea(
             child: Padding(
               padding: const EdgeInsets.only(top: 24.0),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
+              child: ListView(
+                shrinkWrap: true,
                 children: [
                   ...buildBottomSheetActions(),
                   if (onAddPhotos != null) ...commonActions,
diff --git a/mobile/lib/modules/album/views/album_options_part.dart b/mobile/lib/modules/album/views/album_options_part.dart
index 832db7cb88..2f831e4308 100644
--- a/mobile/lib/modules/album/views/album_options_part.dart
+++ b/mobile/lib/modules/album/views/album_options_part.dart
@@ -142,6 +142,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
 
     buildSharedUsersList() {
       return ListView.builder(
+        primary: false,
         shrinkWrap: true,
         itemCount: sharedUsers.value.length,
         itemBuilder: (context, index) {
@@ -188,9 +189,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
         centerTitle: true,
         title: Text("translated_text_options".tr()),
       ),
-      body: Column(
-        mainAxisAlignment: MainAxisAlignment.start,
-        crossAxisAlignment: CrossAxisAlignment.start,
+      body: ListView(
         children: [
           if (isOwner && album.shared)
             SwitchListTile.adaptive(
diff --git a/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart b/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart
index cb17e6638f..0a883791ac 100644
--- a/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart
+++ b/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart
@@ -63,8 +63,7 @@ class SelectAdditionalUserForSharingPage extends HookConsumerWidget {
           ),
         );
       }
-      return Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
+      return ListView(
         children: [
           Wrap(
             children: [...usersChip],
@@ -81,6 +80,7 @@ class SelectAdditionalUserForSharingPage extends HookConsumerWidget {
             ),
           ),
           ListView.builder(
+            primary: false,
             shrinkWrap: true,
             itemBuilder: ((context, index) {
               return ListTile(
diff --git a/mobile/lib/modules/album/views/select_user_for_sharing_page.dart b/mobile/lib/modules/album/views/select_user_for_sharing_page.dart
index 61550e04f7..763f53c659 100644
--- a/mobile/lib/modules/album/views/select_user_for_sharing_page.dart
+++ b/mobile/lib/modules/album/views/select_user_for_sharing_page.dart
@@ -90,8 +90,7 @@ class SelectUserForSharingPage extends HookConsumerWidget {
           ),
         );
       }
-      return Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
+      return ListView(
         children: [
           Wrap(
             children: [...usersChip],
@@ -108,6 +107,7 @@ class SelectUserForSharingPage extends HookConsumerWidget {
             ).tr(),
           ),
           ListView.builder(
+            primary: false,
             shrinkWrap: true,
             itemBuilder: ((context, index) {
               return ListTile(
diff --git a/mobile/lib/modules/shared_link/views/shared_link_edit_page.dart b/mobile/lib/modules/shared_link/views/shared_link_edit_page.dart
index 288fdae338..b6d892f925 100644
--- a/mobile/lib/modules/shared_link/views/shared_link_edit_page.dart
+++ b/mobile/lib/modules/shared_link/views/shared_link_edit_page.dart
@@ -428,10 +428,8 @@ class SharedLinkEditPage extends HookConsumerWidget {
         leading: const CloseButton(),
         centerTitle: false,
       ),
-      resizeToAvoidBottomInset: false,
       body: SafeArea(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+        child: ListView(
           children: [
             Padding(
               padding: const EdgeInsets.all(padding),
@@ -487,7 +485,10 @@ class SharedLinkEditPage extends HookConsumerWidget {
               Align(
                 alignment: Alignment.bottomRight,
                 child: Padding(
-                  padding: const EdgeInsets.only(right: padding + 10),
+                  padding: const EdgeInsets.only(
+                    right: padding + 10,
+                    bottom: padding,
+                  ),
                   child: ElevatedButton(
                     onPressed:
                         existingLink != null ? handleEditLink : handleNewLink,
@@ -508,6 +509,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
                 padding: const EdgeInsets.only(
                   left: padding,
                   right: padding,
+                  bottom: padding,
                 ),
                 child: buildNewLinkField(),
               ),