diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt
index 6afa5158bb..c52ae8282a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.conversation.start.newmessage
 
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -111,17 +112,18 @@ private fun EnterAccountId(
 
         Spacer(Modifier.weight(2f))
 
-        PrimaryOutlineButton(
-            modifier = Modifier
-                .align(Alignment.CenterHorizontally)
-                .padding(horizontal = LocalDimensions.current.largeMargin)
-                .fillMaxWidth()
-                .contentDescription(R.string.next),
-            enabled = state.isNextButtonEnabled,
-            onClick = callbacks::onContinue
-        ) {
-            LoadingArcOr(state.loading) {
-                Text(stringResource(R.string.next))
+        AnimatedVisibility(state.isNextButtonVisible) {
+            PrimaryOutlineButton(
+                modifier = Modifier
+                    .align(Alignment.CenterHorizontally)
+                    .padding(horizontal = LocalDimensions.current.largeMargin)
+                    .fillMaxWidth()
+                    .contentDescription(R.string.next),
+                onClick = callbacks::onContinue
+            ) {
+                LoadingArcOr(state.loading) {
+                    Text(stringResource(R.string.next))
+                }
             }
         }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageViewModel.kt
index b0dc2ec550..cb94db68d9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageViewModel.kt
@@ -111,7 +111,7 @@ internal data class State(
     val error: GetString? = null,
     val loading: Boolean = false
 ) {
-    val isNextButtonEnabled: Boolean get() = newMessageIdOrOns.isNotBlank()
+    val isNextButtonVisible: Boolean get() = newMessageIdOrOns.isNotBlank()
 }
 
 internal data class Success(val publicKey: String)