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 d519162459..70cc98df34 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -1293,7 +1293,7 @@ public void onError(ErrorResponse error) {
 					.setPositiveButton(R.string.ok, (a, b)->{})
 					.show();
 			handlePublishError(null);
-			publishButton.setEnabled(false);
+			(GlobalUserPreferences.relocatePublishButton ? publishButtonRelocated : publishButton).setEnabled(false);
 		}
 
 		if (replyTo == null) updateRecentLanguages();
@@ -1320,7 +1320,7 @@ private void openPreview(Status result){
 		result.preview=true;
 		wm.removeView(sendingOverlay);
 		sendingOverlay=null;
-		publishButton.setEnabled(true);
+		(GlobalUserPreferences.relocatePublishButton ? publishButtonRelocated : publishButton).setEnabled(true);
 		V.setVisibilityAnimated(sendProgress, View.GONE);
 		InputMethodManager imm=getActivity().getSystemService(InputMethodManager.class);
 		imm.hideSoftInputFromWindow(contentView.getWindowToken(), 0);