diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
index ee2a91962e..c271ae0b95 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
@@ -188,7 +188,11 @@ fun MainToolbar(
             maxWidth.toPx()
           }
 
-          PrimaryToolbar(state, callback) {
+          PrimaryToolbar(
+            state = state,
+            callback = callback,
+            enabled = state.mode != MainToolbarMode.SEARCH
+          ) {
             revealOffset = Offset(it / maxWidth, 0.5f)
           }
 
@@ -338,6 +342,7 @@ private fun ArchiveToolbar(
 private fun PrimaryToolbar(
   state: MainToolbarState,
   callback: MainToolbarCallback,
+  enabled: Boolean = true,
   onSearchButtonPositioned: (Float) -> Unit
 ) {
   TopAppBar(
@@ -365,6 +370,7 @@ private fun PrimaryToolbar(
           modifier = Modifier
             .fillMaxSize()
             .clickable(
+              enabled = enabled,
               onClick = callback::onSettingsClick,
               interactionSource = interactionSource,
               indication = ripple(radius = 14.dp)