diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt
index 5c20200b7..be7ff237c 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt
@@ -130,7 +130,7 @@ class CaptionDialog : DialogFragment() {
         dialog?.apply {
             window?.setLayout(
                 LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.MATCH_PARENT
+                LinearLayout.LayoutParams.WRAP_CONTENT
             )
             window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
         }
diff --git a/app/src/main/res/layout/dialog_image_description.xml b/app/src/main/res/layout/dialog_image_description.xml
index 75e278f81..f2c13bfe2 100644
--- a/app/src/main/res/layout/dialog_image_description.xml
+++ b/app/src/main/res/layout/dialog_image_description.xml
@@ -3,14 +3,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="0dp">
+    android:layout_height="wrap_content"
+    android:minHeight="400dp"
+    android:orientation="vertical">
 
     <com.ortiz.touchview.TouchImageView
         android:id="@+id/imageDescriptionView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginStart="?dialogPreferredPadding"
+        android:layout_marginTop="?dialogPreferredPadding"
+        android:layout_marginEnd="?dialogPreferredPadding"
         android:layout_weight="1"
         android:contentDescription="@string/post_media_image" />
 
@@ -18,10 +21,10 @@
         style="@style/TuskyTextInput"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
         android:layout_marginStart="?dialogPreferredPadding"
-        android:layout_marginEnd="?dialogPreferredPadding"
         android:layout_marginTop="?dialogPreferredPadding"
+        android:layout_marginEnd="?dialogPreferredPadding"
+        android:layout_weight="1"
         app:counterEnabled="false"
         app:counterTextColor="?android:textColorTertiary"
         app:hintEnabled="false">
@@ -31,9 +34,9 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="start"
-            tools:hint="Description"
             android:importantForAutofill="no"
-            android:inputType="textCapSentences|textMultiLine|textAutoCorrect" />
+            android:inputType="textCapSentences|textMultiLine|textAutoCorrect"
+            tools:hint="Description" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ea9e8c985..ee694efc0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -148,7 +148,6 @@
 
     <style name="TuskyDialogOverlay" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="alertDialogStyle">@style/TuskyDialog</item>
-        <item name="android:background">@color/colorBackground</item>
         <item name="android:backgroundDimAmount">0.5</item>
     </style>