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 c066b3d9f..3b6399d19 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
@@ -15,7 +15,6 @@
 
 package com.keylesspalace.tusky.components.compose.dialog
 
-import android.app.Dialog
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.net.Uri
@@ -26,7 +25,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.EditText
-import androidx.appcompat.app.AlertDialog
+import android.widget.LinearLayout
 import androidx.core.os.BundleCompat
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
@@ -36,6 +35,8 @@ import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.transition.Transition
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.databinding.DialogImageDescriptionBinding
+import com.keylesspalace.tusky.util.hide
+import com.keylesspalace.tusky.util.viewBinding
 
 // https://github.com/tootsuite/mastodon/blob/c6904c0d3766a2ea8a81ab025c127169ecb51373/app/models/media_attachment.rb#L32
 private const val MEDIA_DESCRIPTION_CHARACTER_LIMIT = 1500
@@ -44,11 +45,26 @@ class CaptionDialog : DialogFragment() {
     private lateinit var listener: Listener
     private lateinit var input: EditText
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val context = requireContext()
+    private val binding by viewBinding(DialogImageDescriptionBinding::bind)
 
-        val binding = DialogImageDescriptionBinding.inflate(layoutInflater)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NORMAL, R.style.TuskyDialogFragmentStyle)
+    }
 
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        savedInstanceState?.getString(DESCRIPTION_KEY)?.let {
+            input.setText(it)
+        }
+
+        return inflater.inflate(R.layout.dialog_image_description, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         input = binding.imageDescriptionText
         val imageView = binding.imageDescriptionView
         imageView.maxZoom = 6f
@@ -61,20 +77,19 @@ class CaptionDialog : DialogFragment() {
         input.filters = arrayOf(InputFilter.LengthFilter(MEDIA_DESCRIPTION_CHARACTER_LIMIT))
         input.setText(arguments?.getString(EXISTING_DESCRIPTION_ARG))
 
+        binding.cancelButton.setOnClickListener {
+            dismiss()
+        }
         val localId = arguments?.getInt(LOCAL_ID_ARG) ?: error("Missing localId")
-        val dialog = AlertDialog.Builder(context)
-            .setView(binding.root)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                listener.onUpdateDescription(localId, input.text.toString())
-            }
-            .setNegativeButton(android.R.string.cancel, null)
-            .create()
+        binding.okButton.setOnClickListener {
+            listener.onUpdateDescription(localId, input.text.toString())
+            dismiss()
+        }
 
         isCancelable = true
-        val window = dialog.window
-        window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
 
         val previewUri = BundleCompat.getParcelable(requireArguments(), PREVIEW_URI_ARG, Uri::class.java) ?: error("Preview Uri is null")
+
         // Load the image and manually set it into the ImageView because it doesn't have a fixed size.
         Glide.with(this)
             .load(previewUri)
@@ -90,9 +105,23 @@ class CaptionDialog : DialogFragment() {
                 ) {
                     imageView.setImageDrawable(resource)
                 }
-            })
 
-        return dialog
+                override fun onLoadFailed(errorDrawable: Drawable?) {
+                    super.onLoadFailed(errorDrawable)
+                    imageView.hide()
+                }
+            })
+    }
+
+    override fun onStart() {
+        super.onStart()
+        dialog?.apply {
+            window?.setLayout(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.MATCH_PARENT
+            )
+            window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+        }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -100,17 +129,6 @@ class CaptionDialog : DialogFragment() {
         super.onSaveInstanceState(outState)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        savedInstanceState?.getString(DESCRIPTION_KEY)?.let {
-            input.setText(it)
-        }
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
     override fun onAttach(context: Context) {
         super.onAttach(context)
         listener = context as? Listener ?: error("Activity is not ComposeCaptionDialog.Listener")
diff --git a/app/src/main/res/layout/dialog_image_description.xml b/app/src/main/res/layout/dialog_image_description.xml
index d20d8795f..e44b4887e 100644
--- a/app/src/main/res/layout/dialog_image_description.xml
+++ b/app/src/main/res/layout/dialog_image_description.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     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"
@@ -11,28 +13,53 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:contentDescription="@string/post_media_image"/>
+        android:contentDescription="@string/post_media_image" />
 
     <com.google.android.material.textfield.TextInputLayout
         style="@style/TuskyTextInput"
+
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:layout_marginStart="?dialogPreferredPadding"
-        android:layout_marginTop="?dialogPreferredPadding"
         android:layout_marginEnd="?dialogPreferredPadding"
-        app:hintEnabled="false"
+        android:layout_marginTop="?dialogPreferredPadding"
         app:counterEnabled="false"
-        app:counterTextColor="?android:textColorTertiary">
+        app:counterTextColor="?android:textColorTertiary"
+        app:hintEnabled="false">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/imageDescriptionText"
-            android:inputType="textCapSentences|textMultiLine|textAutoCorrect"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:hint="@string/hint_description"
             android:gravity="start"
-            android:importantForAutofill="no" />
+            tools:hint="Description"
+            android:importantForAutofill="no"
+            android:inputType="textCapSentences|textMultiLine|textAutoCorrect" />
 
     </com.google.android.material.textfield.TextInputLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:orientation="horizontal"
+        android:gravity="end"
+        android:layout_marginStart="?dialogPreferredPadding"
+        android:layout_marginEnd="?dialogPreferredPadding">
+
+        <Button
+            android:id="@+id/cancelButton"
+            style="@style/TuskyButton.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@android:string/cancel" />
+
+        <Button
+            android:id="@+id/okButton"
+            style="@style/TuskyButton.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@android:string/ok" />
+    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 51679ed88..a55842359 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -234,7 +234,6 @@
     <string name="hint_display_name">Display name</string>
     <string name="hint_note">Bio</string>
     <string name="hint_search">Search…</string>
-    <string name="hint_description">Description</string>
     <string name="hint_media_description_missing">Media should have a description.</string>
 
     <string name="search_no_results">No results</string>