diff --git a/src/gs-removal-dialog.c b/src/gs-removal-dialog.c
index 03edf8966f55639c0801116f551ff6977ddd1264..5cd00bf2755dd6b62c7c109a92204f0c50d04a18 100644
--- a/src/gs-removal-dialog.c
+++ b/src/gs-removal-dialog.c
@@ -17,12 +17,12 @@
 
 struct _GsRemovalDialog
 {
-	AdwWindow		 parent_instance;
-	GtkLabel		*label;
+	AdwDialog		 parent_instance;
+	AdwPreferencesPage	*prefs_page;
 	GtkWidget		*listbox;
 };
 
-G_DEFINE_TYPE (GsRemovalDialog, gs_removal_dialog, ADW_TYPE_WINDOW)
+G_DEFINE_TYPE (GsRemovalDialog, gs_removal_dialog, ADW_TYPE_DIALOG)
 
 enum {
 	SIGNAL_RESPONSE,
@@ -97,7 +97,7 @@ gs_removal_dialog_show_upgrade_removals (GsRemovalDialog *self,
 				  "and will be automatically removed during upgrade."),
 				  name_version);
 
-	gtk_label_set_text (self->label, text);
+	adw_preferences_page_set_description (self->prefs_page, text);
 
 	removals = gs_app_get_related (upgrade);
 	for (guint i = 0; i < gs_app_list_length (removals); i++) {
@@ -129,15 +129,8 @@ upgrade_clicked_cb (GtkWidget *widget,
 static void
 gs_removal_dialog_init (GsRemovalDialog *self)
 {
-	GtkSettings *settings;
-	gboolean use_caret;
-
 	gtk_widget_init_template (GTK_WIDGET (self));
 
-	settings = gtk_widget_get_settings (GTK_WIDGET (self));
-	g_object_get (settings, "gtk-keynav-use-caret", &use_caret, NULL);
-	gtk_label_set_selectable (self->label, use_caret);
-
 	gtk_list_box_set_sort_func (GTK_LIST_BOX (self->listbox),
 	                            list_sort_func,
 	                            self, NULL);
@@ -150,7 +143,7 @@ gs_removal_dialog_class_init (GsRemovalDialogClass *klass)
 
 	gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-removal-dialog.ui");
 
-	gtk_widget_class_bind_template_child (widget_class, GsRemovalDialog, label);
+	gtk_widget_class_bind_template_child (widget_class, GsRemovalDialog, prefs_page);
 	gtk_widget_class_bind_template_child (widget_class, GsRemovalDialog, listbox);
 	gtk_widget_class_bind_template_callback (widget_class, cancel_clicked_cb);
 	gtk_widget_class_bind_template_callback (widget_class, upgrade_clicked_cb);
diff --git a/src/gs-removal-dialog.h b/src/gs-removal-dialog.h
index 9aa1299519a81e922f6f11d0d68fec4d1c496517..957162b2cd257c3705111702a8edc53d58fa76eb 100644
--- a/src/gs-removal-dialog.h
+++ b/src/gs-removal-dialog.h
@@ -17,7 +17,7 @@ G_BEGIN_DECLS
 
 #define GS_TYPE_REMOVAL_DIALOG (gs_removal_dialog_get_type ())
 
-G_DECLARE_FINAL_TYPE (GsRemovalDialog, gs_removal_dialog, GS, REMOVAL_DIALOG, AdwWindow)
+G_DECLARE_FINAL_TYPE (GsRemovalDialog, gs_removal_dialog, GS, REMOVAL_DIALOG, AdwDialog)
 
 GtkWidget	*gs_removal_dialog_new				(void);
 void		 gs_removal_dialog_show_upgrade_removals	(GsRemovalDialog	 *self,
diff --git a/src/gs-removal-dialog.ui b/src/gs-removal-dialog.ui
index 3a42461325b2cbc7f3e1eedb7147d3080e2b34a6..768f3a2a3771b93e2aa3f7af0fdfc3761afdfae1 100644
--- a/src/gs-removal-dialog.ui
+++ b/src/gs-removal-dialog.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GsRemovalDialog" parent="AdwWindow">
-    <property name="modal">True</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="icon_name">dialog-question</property>
+  <template class="GsRemovalDialog" parent="AdwDialog">
     <property name="title" translatable="yes">Incompatible Software</property>
-    <property name="width-request">318</property>
-    <property name="default-width">470</property>
-    <property name="default-height">400</property>
-    <property name="content">
+    <property name="content-width">470</property>
+    <property name="content-height">400</property>
+    <property name="child">
       <object class="AdwToolbarView">
         <child type="top">
           <object class="AdwHeaderBar">
@@ -43,53 +39,15 @@
           </object>
         </child>
         <property name="content">
-          <object class="GtkBox" id="box">
-            <property name="margin-top">20</property>
-            <property name="margin-start">30</property>
-            <property name="margin-end">30</property>
-            <property name="spacing">30</property>
+          <object class="AdwPreferencesPage" id="prefs_page">
             <child>
-              <object class="GtkBox" id="message_area">
-                <property name="orientation">vertical</property>
-                <property name="spacing">10</property>
-                <property name="hexpand">True</property>
+              <object class="AdwPreferencesGroup">
                 <child>
-                  <object class="GtkLabel" id="label">
-                    <property name="margin-bottom">2</property>
-                    <property name="halign">fill</property>
-                    <property name="valign">start</property>
-                    <property name="vexpand">False</property>
-                    <property name="justify">center</property>
-                    <property name="wrap">True</property>
-                    <property name="width-chars">40</property>
-                    <property name="max-width-chars">40</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="can_focus">True</property>
-                    <property name="min_content_height">160</property>
-                    <property name="hscrollbar_policy">never</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <property name="halign">fill</property>
-                    <property name="hexpand">True</property>
-                    <property name="valign">fill</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkListBox" id="listbox">
-                        <property name="halign">fill</property>
-                        <property name="valign">start</property>
-                        <property name="selection_mode">none</property>
-                        <property name="valign">start</property>
-                        <property name="margin-start">4</property>
-                        <property name="margin-end">4</property>
-                        <property name="margin-top">4</property>
-                        <property name="margin-bottom">4</property>
-                        <style>
-                          <class name="boxed-list" />
-                        </style>
-                      </object>
-                    </child>
+                  <object class="GtkListBox" id="listbox">
+                    <property name="selection_mode">none</property>
+                    <style>
+                      <class name="boxed-list" />
+                    </style>
                   </object>
                 </child>
               </object>
diff --git a/src/gs-updates-page.c b/src/gs-updates-page.c
index 59418926eebc87eed179e3cc749bd0caa4e4a3f9..edbe3e567b8b96db91fdd22b9459d07d83bafa09 100644
--- a/src/gs-updates-page.c
+++ b/src/gs-updates-page.c
@@ -1098,7 +1098,7 @@ gs_updates_page_upgrade_install_cb (GsUpgradeBanner *upgrade_banner,
 	                  self);
 	gs_removal_dialog_show_upgrade_removals (GS_REMOVAL_DIALOG (dialog),
 	                                         upgrade);
-	gs_shell_modal_dialog_present (self->shell, GTK_WINDOW (dialog));
+	adw_dialog_present (ADW_DIALOG (dialog), GTK_WIDGET (self));
 }
 
 static void