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 a96cd5ab2..930b173ff 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -822,7 +822,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 //		if (publishText == R.string.publish && !GlobalUserPreferences.publishButtonText.isEmpty()) {
 //			publishButton.setText(GlobalUserPreferences.publishButtonText);
 //		} else {
-		publishButton.setText(publishText);
+		if(!GlobalUserPreferences.relocatePublishButton){
+			publishButton.setText(publishText);
+		}
 //		}
 	}