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 535a16942..f5c88618f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -651,6 +651,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
 			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + UiUtils.getVisibilityText(replyTo));
+			replyText.setOnClickListener(v->{
+				scrollView.smoothScrollTo(0, 0);
+			});
 
 			ArrayList<String> mentions=new ArrayList<>();
 			String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index ee65d7737..7323ad927 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -56,10 +56,10 @@
 
 				<TextView
 					android:id="@+id/reply_text"
-					android:layout_width="match_parent"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="-12dp"
-					android:paddingHorizontal="16dp"
+					android:layout_marginStart="16dp"
 					android:paddingTop="16dp"
 					android:paddingBottom="6dp"
 					android:textAppearance="@style/m3_title_small"
@@ -68,8 +68,7 @@
 					android:drawableTint="?android:textColorSecondary"
 					android:drawablePadding="6dp"
 					android:singleLine="true"
-					android:ellipsize="end"
-					android:background="?android:selectableItemBackground"/>
+					android:ellipsize="end"/>
 
 				<RelativeLayout
 					android:layout_width="match_parent"