diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/newCommunity/NewCommunityScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/newCommunity/NewCommunityScreen.kt
index bef4e8283..456a577c3 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/newCommunity/NewCommunityScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/newCommunity/NewCommunityScreen.kt
@@ -150,9 +150,12 @@ private fun CommunityFormScreen(
 
     Scaffold(
         topBar = {
-            val titleRes =
-                if (model.isEditing()) R.string.edit_community else R.string.new_community
-            if (model.isEditing()) {
+            // Derive the top bar from the parameter, not model.isEditing(), so the
+            // first composition of the edit screen already shows "Save" before
+            // loadFrom() runs in its LaunchedEffect.
+            val isEditing = editing != null
+            val titleRes = if (isEditing) R.string.edit_community else R.string.new_community
+            if (isEditing) {
                 ActionTopBar(
                     titleRes = titleRes,
                     postRes = R.string.save,