diff --git a/panels/applications/cc-removable-media-settings.c b/panels/applications/cc-removable-media-settings.c
index 62a72709e..f4211a909 100644
--- a/panels/applications/cc-removable-media-settings.c
+++ b/panels/applications/cc-removable-media-settings.c
@@ -57,7 +57,7 @@ struct _CcRemovableMediaSettings
   GtkAppChooserButton *audio_cdda_chooser;
   GtkAppChooserButton *dcf_chooser;
   GtkAppChooserButton *music_player_chooser;
-  GtkDialog           *other_type_dialog;
+  AdwWindow           *other_type_dialog;
   AdwActionRow        *other_action_row;
   GtkBox              *other_action_box;
   GtkComboBox         *other_type_combo_box;
@@ -365,8 +365,6 @@ on_extra_options_button_clicked (CcRemovableMediaSettings *self)
   GtkWidget *toplevel = cc_shell_get_toplevel (shell);
 
   gtk_window_set_transient_for (GTK_WINDOW (self->other_type_dialog), GTK_WINDOW (toplevel));
-  gtk_window_set_modal (GTK_WINDOW (self->other_type_dialog), TRUE);
-  gtk_window_set_title (GTK_WINDOW (self->other_type_dialog), _("Other Media"));
   /* update other_application_chooser */
   on_other_type_combo_box_changed (self);
   gtk_window_present (GTK_WINDOW (self->other_type_dialog));
diff --git a/panels/applications/cc-removable-media-settings.ui b/panels/applications/cc-removable-media-settings.ui
index f2b1091f1..4a228a8af 100644
--- a/panels/applications/cc-removable-media-settings.ui
+++ b/panels/applications/cc-removable-media-settings.ui
@@ -97,6 +97,7 @@
   </object>
 
   <object class="AdwWindow" id="other_type_dialog">
+    <property name="title" translatable="yes">Other Media</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>