diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
index 0372043b..1bf483d6 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
@@ -334,7 +334,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 holder.binding.content.setSelection(statusDraft.cursorPosition); //Put cursor at the end
                 buttonVisibility(holder);
             });
-        } else if (mentionedAccount != null) {
+        } else if (mentionedAccount != null && statusDraft.text == null) {
             final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
             boolean capitalize = sharedpreferences.getBoolean(context.getString(R.string.SET_CAPITALIZE), true);
             if (capitalize) {
@@ -537,6 +537,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 if (holder.binding.content.getSelectionStart() > 0 && holder.getLayoutPosition() >= 0) {
                     statusList.get(holder.getLayoutPosition()).cursorPosition = holder.binding.content.getSelectionStart();
                 }
+
                 //Copy/past
                 int max_car = MastodonHelper.getInstanceMaxChars(context);
                 if (currentLength > max_car) {
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/472.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/472.txt
index 4d5420e3..41188591 100644
--- a/src/fdroid/fastlane/metadata/android/en/changelogs/472.txt
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/472.txt
@@ -5,5 +5,5 @@ Changed:
 - Cross actions with two accounts display a dialog
 
 Fixed:
-
+- Text cleared when adding a media
 - Fix crashes
\ No newline at end of file