diff --git a/src/gs-repos-dialog.c b/src/gs-repos-dialog.c
index 82bef6a39279c0bbc27dc1f74b7a46a73809a1a6..233606e5fe81202a840ff9696fb8567cc365c301 100644
--- a/src/gs-repos-dialog.c
+++ b/src/gs-repos-dialog.c
@@ -22,7 +22,7 @@
 
 struct _GsReposDialog
 {
-	AdwWindow	 parent_instance;
+	AdwDialog	 parent_instance;
 	GSettings	*settings;
 	GsFedoraThirdParty *third_party;
 	gboolean	 third_party_enabled;
@@ -37,7 +37,7 @@ struct _GsReposDialog
 	GtkWidget	*stack;
 };
 
-G_DEFINE_TYPE (GsReposDialog, gs_repos_dialog, ADW_TYPE_WINDOW)
+G_DEFINE_TYPE (GsReposDialog, gs_repos_dialog, ADW_TYPE_DIALOG)
 
 static void reload_third_party_repos (GsReposDialog *dialog);
 
@@ -115,7 +115,7 @@ _enable_repo (InstallRemoveData *install_data)
 }
 
 static void
-enable_repo_response_cb (AdwMessageDialog *confirm_dialog,
+enable_repo_response_cb (AdwAlertDialog *confirm_dialog,
 			 const gchar *response,
 			 gpointer user_data)
 {
@@ -149,7 +149,7 @@ enable_repo (GsReposDialog *dialog,
 
 	/* user needs to confirm acceptance of an agreement */
 	if (gs_app_get_agreement (repo) != NULL) {
-		GtkWidget *confirm_dialog;
+		AdwDialog *confirm_dialog;
 		g_autofree gchar *message = NULL;
 		g_autoptr(GError) error = NULL;
 
@@ -167,23 +167,22 @@ enable_repo (GsReposDialog *dialog,
 		}
 
 		/* ask for confirmation */
-		confirm_dialog = adw_message_dialog_new (GTK_WINDOW (dialog),
-							 /* TRANSLATORS: window title */
-							 _("Enable Third-Party Software Repository?"),
-							 message);
-		adw_message_dialog_add_responses (ADW_MESSAGE_DIALOG (confirm_dialog),
-						  "cancel",  _("_Cancel"),
-						  /* TRANSLATORS: button to accept the agreement */
-						  "enable", _("_Enable"),
-						  NULL);
+		/* TRANSLATORS: "Enable Third-Party Software Repository?" is
+		 * the confirmation dialog title */
+		confirm_dialog = adw_alert_dialog_new (_("Enable Third-Party Software Repository?"),
+						       message);
+		adw_alert_dialog_add_responses (ADW_ALERT_DIALOG (confirm_dialog),
+						"cancel",  _("_Cancel"),
+						/* TRANSLATORS: button to accept the agreement */
+						"enable", _("_Enable"),
+						NULL);
 
 		/* handle this async */
 		g_signal_connect (confirm_dialog, "response",
 				  G_CALLBACK (enable_repo_response_cb),
 				  g_steal_pointer (&install_data));
 
-		gtk_window_set_modal (GTK_WINDOW (confirm_dialog), TRUE);
-		gtk_window_present (GTK_WINDOW (confirm_dialog));
+		adw_dialog_present (confirm_dialog, GTK_WIDGET (dialog));
 		return;
 	}
 
@@ -192,7 +191,7 @@ enable_repo (GsReposDialog *dialog,
 }
 
 static void
-remove_repo_response_cb (AdwMessageDialog *confirm_dialog,
+remove_repo_response_cb (AdwAlertDialog *confirm_dialog,
                          const gchar *response,
                          gpointer user_data)
 {
@@ -232,7 +231,7 @@ remove_confirm_repo (GsReposDialog *dialog,
 		     GsPluginManageRepositoryFlags operation)
 {
 	InstallRemoveData *remove_data;
-	GtkWidget *confirm_dialog;
+	AdwDialog *confirm_dialog;
 	g_autofree gchar *message = NULL;
 
 	remove_data = g_slice_new0 (InstallRemoveData);
@@ -246,28 +245,26 @@ remove_confirm_repo (GsReposDialog *dialog,
 			gs_app_get_name (repo));
 
 	/* ask for confirmation */
-	confirm_dialog = adw_message_dialog_new (GTK_WINDOW (dialog),
-						 operation == GS_PLUGIN_MANAGE_REPOSITORY_FLAGS_DISABLE ? _("Disable Repository?") : _("Remove Repository?"),
+	confirm_dialog = adw_alert_dialog_new (operation == GS_PLUGIN_MANAGE_REPOSITORY_FLAGS_DISABLE ? _("Disable Repository?") : _("Remove Repository?"),
 						 message);
-	adw_message_dialog_add_response (ADW_MESSAGE_DIALOG (confirm_dialog),
+	adw_alert_dialog_add_response (ADW_ALERT_DIALOG (confirm_dialog),
 					 "cancel",  _("_Cancel"));
 
 	if (operation == GS_PLUGIN_MANAGE_REPOSITORY_FLAGS_DISABLE) {
 		/* TRANSLATORS: this is button text to disable a repo */
-		adw_message_dialog_add_response (ADW_MESSAGE_DIALOG (confirm_dialog), "disable",  _("_Disable"));
-		adw_message_dialog_set_response_appearance (ADW_MESSAGE_DIALOG (confirm_dialog), "disable", ADW_RESPONSE_DESTRUCTIVE);
+		adw_alert_dialog_add_response (ADW_ALERT_DIALOG (confirm_dialog), "disable",  _("_Disable"));
+		adw_alert_dialog_set_response_appearance (ADW_ALERT_DIALOG (confirm_dialog), "disable", ADW_RESPONSE_DESTRUCTIVE);
 	} else {
 		/* TRANSLATORS: this is button text to remove a repo */
-		adw_message_dialog_add_response (ADW_MESSAGE_DIALOG (confirm_dialog), "remove",  _("_Remove"));
-		adw_message_dialog_set_response_appearance (ADW_MESSAGE_DIALOG (confirm_dialog), "remove", ADW_RESPONSE_DESTRUCTIVE);
+		adw_alert_dialog_add_response (ADW_ALERT_DIALOG (confirm_dialog), "remove",  _("_Remove"));
+		adw_alert_dialog_set_response_appearance (ADW_ALERT_DIALOG (confirm_dialog), "remove", ADW_RESPONSE_DESTRUCTIVE);
 	}
 
 	/* handle this async */
 	g_signal_connect (confirm_dialog, "response",
 			  G_CALLBACK (remove_repo_response_cb), remove_data);
 
-	gtk_window_set_modal (GTK_WINDOW (confirm_dialog), TRUE);
-	gtk_window_present (GTK_WINDOW (confirm_dialog));
+	adw_dialog_present (confirm_dialog, GTK_WIDGET (dialog));
 
 	gs_repo_row_mark_busy (row);
 }
@@ -856,18 +853,14 @@ gs_repos_dialog_class_init (GsReposDialogClass *klass)
 	gtk_widget_class_bind_template_child (widget_class, GsReposDialog, content_page);
 	gtk_widget_class_bind_template_child (widget_class, GsReposDialog, spinner);
 	gtk_widget_class_bind_template_child (widget_class, GsReposDialog, stack);
-
-	gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0, "window.close", NULL);
 }
 
 GtkWidget *
-gs_repos_dialog_new (GtkWindow *parent, GsPluginLoader *plugin_loader)
+gs_repos_dialog_new (GsPluginLoader *plugin_loader)
 {
 	GsReposDialog *dialog;
 
 	dialog = g_object_new (GS_TYPE_REPOS_DIALOG,
-			       "transient-for", parent,
-			       "modal", TRUE,
 			       NULL);
 	dialog->third_party = gs_fedora_third_party_new (plugin_loader);
 	set_plugin_loader (dialog, plugin_loader);
diff --git a/src/gs-repos-dialog.h b/src/gs-repos-dialog.h
index 08aa8e1797344ae7d4686b48c04ae329a63dffe4..6eb979f1862f48f10e9acfd61710d08c52173806 100644
--- a/src/gs-repos-dialog.h
+++ b/src/gs-repos-dialog.h
@@ -18,9 +18,8 @@ G_BEGIN_DECLS
 
 #define GS_TYPE_REPOS_DIALOG (gs_repos_dialog_get_type ())
 
-G_DECLARE_FINAL_TYPE (GsReposDialog, gs_repos_dialog, GS, REPOS_DIALOG, AdwWindow)
+G_DECLARE_FINAL_TYPE (GsReposDialog, gs_repos_dialog, GS, REPOS_DIALOG, AdwDialog)
 
-GtkWidget	*gs_repos_dialog_new		(GtkWindow	*parent,
-						 GsPluginLoader	*plugin_loader);
+GtkWidget	*gs_repos_dialog_new		(GsPluginLoader	*plugin_loader);
 
 G_END_DECLS
diff --git a/src/gs-repos-dialog.ui b/src/gs-repos-dialog.ui
index cdac27b3d3ed4f07c83a3605c1cd2654196425bd..678af46ea1e57c7567a548f49bd79dbd3ac30045 100644
--- a/src/gs-repos-dialog.ui
+++ b/src/gs-repos-dialog.ui
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.10"/>
-  <template class="GsReposDialog" parent="AdwWindow">
-    <property name="modal">True</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="icon_name">dialog-information</property>
+  <template class="GsReposDialog" parent="AdwDialog">
     <property name="title" translatable="yes">Software Repositories</property>
-    <property name="width-request">318</property>
-    <property name="default-width">640</property>
-    <property name="default-height">576</property>
-
-    <child>
+    <property name="content-width">640</property>
+    <property name="content-height">576</property>
+    <property name="child">
       <object class="AdwToolbarView">
         <child type="top">
           <object class="AdwHeaderBar">
-            <property name="show_start_title_buttons">True</property>
-            <property name="show_end_title_buttons">True</property>
             <property name="title-widget">
               <object class="AdwWindowTitle">
                 <property name="title" bind-source="GsReposDialog" bind-property="title" bind-flags="sync-create"/>
@@ -69,6 +61,6 @@
           </object>
         </property>
       </object>
-    </child>
+    </property>
   </template>
 </interface>
diff --git a/src/gs-shell.c b/src/gs-shell.c
index 7df7e66bb7bf835d0afb706c81b3d8e4a9b36aac..d77f787966c670bdf7d8df6003dda0bdc9a55303 100644
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@ -2343,8 +2343,8 @@ gs_shell_show_sources (GsShell *shell)
 {
 	GtkWidget *dialog;
 
-	dialog = gs_repos_dialog_new (GTK_WINDOW (shell), shell->plugin_loader);
-	gs_shell_modal_dialog_present (shell, GTK_WINDOW (dialog));
+	dialog = gs_repos_dialog_new (shell->plugin_loader);
+	adw_dialog_present (ADW_DIALOG (dialog), GTK_WIDGET (shell));
 }
 
 void