diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7e8520fb9..c5fd2dbb8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,7 +60,7 @@
         <activity
             android:name=".activities.ComposeActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:windowSoftInputMode="stateVisible"
+            android:windowSoftInputMode="adjustPan|adjustResize"
             android:label="@string/compose" />
         <activity
             android:name=".activities.StatusInfoActivity"
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
index 5f0f19c17..c1614ccd4 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
@@ -484,6 +484,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                         builderInner.setView(popupMediaDescriptionBinding.getRoot());
 
                         popupMediaDescriptionBinding.mediaDescription.setFilters(new InputFilter[]{new InputFilter.LengthFilter(1500)});
+                        popupMediaDescriptionBinding.mediaDescription.requestFocus();
                         Glide.with(popupMediaDescriptionBinding.mediaPicture.getContext())
                                 .asBitmap()
                                 .load(attachmentPath)
@@ -492,7 +493,6 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                                     @Override
                                     public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
                                         popupMediaDescriptionBinding.mediaPicture.setImageBitmap(resource);
-                                        popupMediaDescriptionBinding.mediaPicture.setImageAlpha(60);
                                     }
 
                                     @Override
diff --git a/app/src/main/res/layout/popup_media_description.xml b/app/src/main/res/layout/popup_media_description.xml
index 407374d0c..52b0534f4 100644
--- a/app/src/main/res/layout/popup_media_description.xml
+++ b/app/src/main/res/layout/popup_media_description.xml
@@ -14,27 +14,39 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="@dimen/fab_margin"
-    tools:context=".activities.ComposeActivity">
+    android:layout_height="wrap_content">
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/media_picture"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:adjustViewBounds="true"
-        android:contentDescription="@string/media_description"
-        android:scaleType="fitCenter" />
-
-    <androidx.appcompat.widget.AppCompatEditText
-        android:id="@+id/media_description"
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/media_picture"
-        android:layout_centerInParent="true"
-        android:inputType="textMultiLine" />
+        tools:context=".activities.ComposeActivity">
 
-</RelativeLayout>
\ No newline at end of file
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/media_picture"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:contentDescription="@string/media_description"
+            android:scaleType="fitCenter"
+            app:layout_constraintBottom_toTopOf="@+id/media_description"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/media_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/media_picture"
+            android:layout_marginHorizontal="6dp"
+            android:layout_marginTop="10dp"
+            android:inputType="textMultiLine|textCapSentences"
+            android:minLines="3"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/media_picture" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>