diff --git a/app/src/main/java/org/thoughtcrime/securesms/media/MediaOverviewScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/media/MediaOverviewScreen.kt
index f79d387138..bb2ff8ad27 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/media/MediaOverviewScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/media/MediaOverviewScreen.kt
@@ -144,6 +144,7 @@ fun MediaOverviewScreen(
                 onSaveClicked = { showingSaveAttachmentWarning = true },
                 onDeleteClicked = { showingDeleteConfirmation = true },
                 onSelectAllClicked = viewModel::onSelectAllClicked,
+                numSelected = selectedItems.size,
                 appBarScrollBehavior = appBarScrollBehavior
             )
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/media/MediaOverviewTopAppBar.kt b/app/src/main/java/org/thoughtcrime/securesms/media/MediaOverviewTopAppBar.kt
index 7ae5ba516d..570885f212 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/media/MediaOverviewTopAppBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/media/MediaOverviewTopAppBar.kt
@@ -16,6 +16,7 @@ import org.thoughtcrime.securesms.ui.theme.LocalColors
 @OptIn(ExperimentalMaterial3Api::class)
 fun MediaOverviewTopAppBar(
     selectionMode: Boolean,
+    numSelected: Int,
     title: String,
     onBackClicked: () -> Unit,
     onSaveClicked: () -> Unit,
@@ -25,7 +26,8 @@ fun MediaOverviewTopAppBar(
 ) {
     ActionAppBar(
         title = title,
-        navigationIcon = {AppBarBackIcon(onBack = onBackClicked)},
+        actionModeTitle = numSelected.toString(),
+        navigationIcon = { AppBarBackIcon(onBack = onBackClicked) },
         scrollBehavior = appBarScrollBehavior,
         actionMode = selectionMode,
         actionModeActions = {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/AppBar.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/AppBar.kt
index 8cc0f9acab..ff9369e8a2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/AppBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/AppBar.kt
@@ -2,26 +2,27 @@ package org.thoughtcrime.securesms.ui.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarColors
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import androidx.compose.ui.unit.dp
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.ui.Divider
 import org.thoughtcrime.securesms.ui.theme.LocalColors
+import org.thoughtcrime.securesms.ui.theme.LocalDimensions
 import org.thoughtcrime.securesms.ui.theme.LocalType
 import org.thoughtcrime.securesms.ui.theme.PreviewTheme
 import org.thoughtcrime.securesms.ui.theme.SessionColorsParameterProvider
@@ -37,7 +38,10 @@ fun AppBarPreview(
         Column() {
             BasicAppBar(title = "Basic App Bar")
             Divider()
-            BasicAppBar(title = "Basic App Bar With Color", backgroundColor = LocalColors.current.backgroundSecondary)
+            BasicAppBar(
+                title = "Basic App Bar With Color",
+                backgroundColor = LocalColors.current.backgroundSecondary
+            )
             Divider()
             BackAppBar(title = "Back Bar", onBack = {})
             Divider()
@@ -69,7 +73,7 @@ fun BasicAppBar(
     backgroundColor: Color = LocalColors.current.background,
     navigationIcon: @Composable () -> Unit = {},
     actions: @Composable RowScope.() -> Unit = {},
-){
+) {
     CenterAlignedTopAppBar(
         modifier = modifier,
         title = {
@@ -94,7 +98,7 @@ fun BackAppBar(
     scrollBehavior: TopAppBarScrollBehavior? = null,
     backgroundColor: Color = LocalColors.current.background,
     actions: @Composable RowScope.() -> Unit = {},
-){
+) {
     BasicAppBar(
         modifier = modifier,
         title = title,
@@ -115,6 +119,7 @@ fun ActionAppBar(
     scrollBehavior: TopAppBarScrollBehavior? = null,
     backgroundColor: Color = LocalColors.current.background,
     actionMode: Boolean = false,
+    actionModeTitle: String = "",
     navigationIcon: @Composable () -> Unit = {},
     actions: @Composable RowScope.() -> Unit = {},
     actionModeActions: @Composable (RowScope.() -> Unit) = {},
@@ -126,7 +131,19 @@ fun ActionAppBar(
                 AppBarText(title = title)
             }
         },
-        navigationIcon =navigationIcon,
+        navigationIcon = {
+            if (actionMode) {
+                Row(
+                    horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.xxxsSpacing),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    navigationIcon()
+                    AppBarText(title = actionModeTitle)
+                }
+            } else {
+                navigationIcon()
+            }
+        },
         scrollBehavior = scrollBehavior,
         colors = appBarColors(backgroundColor),
         actions = {