diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 732b062a4..7e90de32e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -822,6 +822,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		draftsBtn.setOnTouchListener(draftOptionsPopup.getDragToOpenListener());
 		updateScheduledAt(scheduledAt != null ? scheduledAt : scheduledStatus != null ? scheduledStatus.scheduledAt : null);
 		buildLanguageSelector(languageButton);
+
+		if (editingStatus != null && scheduledStatus == null) {
+			// editing an already published post
+			draftsBtn.setVisibility(View.GONE);
+		}
 	}
 
 	private void navigateToUnsentPosts() {
diff --git a/mastodon/src/main/res/layout/compose_action.xml b/mastodon/src/main/res/layout/compose_action.xml
index 841910f73..beb02101e 100644
--- a/mastodon/src/main/res/layout/compose_action.xml
+++ b/mastodon/src/main/res/layout/compose_action.xml
@@ -45,7 +45,6 @@
         android:id="@+id/drafts_btn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
         android:paddingHorizontal="8dp"
         android:drawableStart="@drawable/ic_fluent_clock_20_regular"
         android:drawableTint="?android:textColorSecondary"
@@ -69,6 +68,7 @@
         android:id="@+id/publish_btn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
         android:singleLine="true"
         android:ellipsize="end"
         android:visibility="gone"