diff --git a/panels/search/cc-search-locations-dialog.c b/panels/search/cc-search-locations-page.c
similarity index 90%
rename from panels/search/cc-search-locations-dialog.c
rename to panels/search/cc-search-locations-page.c
index ab73aca2574723dcc4ee2c0c2ce0abdeb41b877c..5bc8d616802cac44b4ffbf18f3b03892d1a2f856 100644
--- a/panels/search/cc-search-locations-dialog.c
+++ b/panels/search/cc-search-locations-page.c
@@ -18,7 +18,7 @@
  * Author: Cosimo Cecchi <cosimoc@gnome.org>
  */
 
-#include "cc-search-locations-dialog.h"
+#include "cc-search-locations-page.h"
 
 #include <glib/gi18n.h>
 
@@ -34,7 +34,7 @@ typedef enum {
 } PlaceType;
 
 typedef struct {
-  CcSearchLocationsDialog *dialog;
+  CcSearchLocationsPage *page;
   GFile *location;
   gchar *display_name;
   PlaceType place_type;
@@ -42,8 +42,8 @@ typedef struct {
   const gchar *settings_key;
 } Place;
 
-struct _CcSearchLocationsDialog {
-  AdwWindow            parent;
+struct _CcSearchLocationsPage {
+  AdwNavigationPage    parent;
 
   GSettings           *tracker_preferences;
 
@@ -55,16 +55,12 @@ struct _CcSearchLocationsDialog {
   GtkWidget           *locations_add;
 };
 
-struct _CcSearchLocationsDialogClass {
-  AdwPreferencesWindowClass parent_class;
-};
-
-G_DEFINE_TYPE (CcSearchLocationsDialog, cc_search_locations_dialog, ADW_TYPE_WINDOW)
+G_DEFINE_TYPE (CcSearchLocationsPage, cc_search_locations_page, ADW_TYPE_NAVIGATION_PAGE)
 
 static const gchar *path_from_tracker_dir (const gchar *value);
 
 static gboolean
-keynav_failed_cb (CcSearchLocationsDialog *self,
+keynav_failed_cb (CcSearchLocationsPage *self,
                   GtkDirectionType         direction)
 {
   GtkWidget *toplevel = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (self)));
@@ -80,19 +76,47 @@ keynav_failed_cb (CcSearchLocationsDialog *self,
 }
 
 static void
-cc_search_locations_dialog_finalize (GObject *object)
+cc_search_locations_page_finalize (GObject *object)
 {
-  CcSearchLocationsDialog *self = CC_SEARCH_LOCATIONS_DIALOG (object);
+  CcSearchLocationsPage *self = CC_SEARCH_LOCATIONS_PAGE (object);
 
   g_clear_object (&self->tracker_preferences);
 
-  G_OBJECT_CLASS (cc_search_locations_dialog_parent_class)->finalize (object);
+  G_OBJECT_CLASS (cc_search_locations_page_parent_class)->finalize (object);
 }
 
+static void other_places_refresh (CcSearchLocationsPage *self);
+static void populate_list_boxes (CcSearchLocationsPage *self);
+static gint place_compare_func (gconstpointer a, gconstpointer b, gpointer user_data);
+
 static void
-cc_search_locations_dialog_init (CcSearchLocationsDialog *self)
+cc_search_locations_page_init (CcSearchLocationsPage *self)
 {
+  GSettingsSchemaSource *source;
+  g_autoptr(GSettingsSchema) schema = NULL;
+
   gtk_widget_init_template (GTK_WIDGET (self));
+
+  source = g_settings_schema_source_get_default ();
+  schema = g_settings_schema_source_lookup (source, TRACKER3_SCHEMA, TRUE);
+  if (schema)
+    self->tracker_preferences = g_settings_new (TRACKER3_SCHEMA);
+  else
+    self->tracker_preferences = g_settings_new (TRACKER_SCHEMA);
+
+  populate_list_boxes (self);
+
+  gtk_list_box_set_sort_func (GTK_LIST_BOX (self->places_list),
+                              (GtkListBoxSortFunc) place_compare_func, NULL, NULL);
+  gtk_list_box_set_sort_func (GTK_LIST_BOX (self->bookmarks_list),
+                              (GtkListBoxSortFunc) place_compare_func, NULL, NULL);
+  gtk_list_box_set_sort_func (GTK_LIST_BOX (self->others_list),
+                              (GtkListBoxSortFunc) place_compare_func, NULL, NULL);
+
+  g_signal_connect_swapped (self->tracker_preferences, "changed::" TRACKER_KEY_RECURSIVE_DIRECTORIES,
+                            G_CALLBACK (other_places_refresh), self);
+  g_signal_connect_swapped (self->tracker_preferences, "changed::" TRACKER_KEY_SINGLE_DIRECTORIES,
+                            G_CALLBACK (other_places_refresh), self);
 }
 
 static gboolean
@@ -120,7 +144,7 @@ location_in_path_strv (GFile       *location,
 }
 
 static Place *
-place_new (CcSearchLocationsDialog *dialog,
+place_new (CcSearchLocationsPage *page,
            GFile *location,
            gchar *display_name,
            PlaceType place_type)
@@ -130,12 +154,12 @@ place_new (CcSearchLocationsDialog *dialog,
   g_autofree const char **single_dir_default = NULL;
   g_auto(GStrv) single_dir = NULL;
 
-  single_dir_default_var = g_settings_get_default_value (dialog->tracker_preferences,
+  single_dir_default_var = g_settings_get_default_value (page->tracker_preferences,
                                                          TRACKER_KEY_SINGLE_DIRECTORIES);
   single_dir_default = g_variant_get_strv (single_dir_default_var, NULL);
-  single_dir = g_settings_get_strv (dialog->tracker_preferences, TRACKER_KEY_SINGLE_DIRECTORIES);
+  single_dir = g_settings_get_strv (page->tracker_preferences, TRACKER_KEY_SINGLE_DIRECTORIES);
 
-  new_place->dialog = dialog;
+  new_place->page = page;
   new_place->location = location;
   if (display_name != NULL)
     new_place->display_name = display_name;
@@ -167,7 +191,7 @@ place_free (Place * p)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (Place, place_free)
 
 static GList *
-get_bookmarks (CcSearchLocationsDialog *self)
+get_bookmarks (CcSearchLocationsPage *self)
 {
   g_autoptr(GFile) file = NULL;
   g_autofree gchar *contents = NULL;
@@ -227,7 +251,7 @@ get_user_special_dir_if_not_home (GUserDirectory idx)
 }
 
 static GList *
-get_xdg_dirs (CcSearchLocationsDialog *self)
+get_xdg_dirs (CcSearchLocationsPage *self)
 {
   GList *xdg_dirs = NULL;
   gint idx;
@@ -315,7 +339,7 @@ path_from_tracker_dir (const gchar *value)
 }
 
 static GPtrArray *
-place_get_new_settings_values (CcSearchLocationsDialog *self,
+place_get_new_settings_values (CcSearchLocationsPage *self,
                                Place *place,
                                gboolean remove)
 {
@@ -356,7 +380,7 @@ place_get_new_settings_values (CcSearchLocationsDialog *self,
 
 
 static GList *
-get_tracker_locations (CcSearchLocationsDialog *self)
+get_tracker_locations (CcSearchLocationsPage *self)
 {
   g_auto(GStrv) locations_single = NULL;
   g_auto(GStrv) locations = NULL;
@@ -394,7 +418,7 @@ get_tracker_locations (CcSearchLocationsDialog *self)
 }
 
 static GList *
-get_places_list (CcSearchLocationsDialog *self)
+get_places_list (CcSearchLocationsPage *self)
 {
   g_autoptr(GList) xdg_list = NULL;
   g_autoptr(GList) tracker_list = NULL;
@@ -487,7 +511,7 @@ switch_tracker_set_mapping (const GValue *value,
   gboolean remove;
 
   remove = !g_value_get_boolean (value);
-  new_values = place_get_new_settings_values (place->dialog, place, remove);
+  new_values = place_get_new_settings_values (place->page, place, remove);
   return g_variant_new_strv ((const gchar **) new_values->pdata, -1);
 }
 
@@ -511,7 +535,7 @@ place_query_info_ready (GObject *source,
 }
 
 static void
-remove_button_clicked (CcSearchLocationsDialog *self,
+remove_button_clicked (CcSearchLocationsPage *self,
                        GtkWidget *button)
 {
   g_autoptr(GPtrArray) new_values = NULL;
@@ -550,7 +574,7 @@ place_compare_func (gconstpointer a,
 }
 
 static GtkWidget *
-create_row_for_place (CcSearchLocationsDialog *self, Place *place)
+create_row_for_place (CcSearchLocationsPage *self, Place *place)
 {
   AdwActionRow *row;
   GtkWidget *index_switch, *remove_button;
@@ -586,7 +610,7 @@ create_row_for_place (CcSearchLocationsDialog *self, Place *place)
       adw_action_row_add_suffix (row, index_switch);
       adw_action_row_set_activatable_widget (row, index_switch);
 
-      g_settings_bind_with_mapping (place->dialog->tracker_preferences, place->settings_key,
+      g_settings_bind_with_mapping (place->page->tracker_preferences, place->settings_key,
                                     index_switch, "active",
                                     G_SETTINGS_BIND_DEFAULT,
                                     switch_tracker_get_mapping,
@@ -603,7 +627,7 @@ create_row_for_place (CcSearchLocationsDialog *self, Place *place)
 }
 
 static void
-update_list_visibility (CcSearchLocationsDialog *self)
+update_list_visibility (CcSearchLocationsPage *self)
 {
   gtk_widget_set_visible (self->places_group,
                           gtk_list_box_get_row_at_index (GTK_LIST_BOX (self->places_list), 0)
@@ -614,7 +638,7 @@ update_list_visibility (CcSearchLocationsDialog *self)
 }
 
 static void
-populate_list_boxes (CcSearchLocationsDialog *self)
+populate_list_boxes (CcSearchLocationsPage *self)
 {
   g_autoptr(GList) places = NULL;
   GList *l;
@@ -651,7 +675,7 @@ add_file_chooser_response (GObject      *source,
                            GAsyncResult *res,
                            gpointer      user_data)
 {
-  CcSearchLocationsDialog *self = CC_SEARCH_LOCATIONS_DIALOG (user_data);
+  CcSearchLocationsPage *self = CC_SEARCH_LOCATIONS_PAGE (user_data);
   GtkFileDialog *file_dialog = GTK_FILE_DIALOG (source);
   g_autoptr(Place) place = NULL;
   g_autoptr(GPtrArray) new_values = NULL;
@@ -675,22 +699,23 @@ add_file_chooser_response (GObject      *source,
 }
 
 static void
-add_button_clicked (CcSearchLocationsDialog *self)
+add_button_clicked (CcSearchLocationsPage *self)
 {
   GtkFileDialog *file_dialog;
+  GtkWidget *toplevel = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (self)));
 
   file_dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (file_dialog, _("Select Location"));
   gtk_file_dialog_set_modal (file_dialog, TRUE);
 
-  gtk_file_dialog_select_folder (file_dialog, GTK_WINDOW (self),
+  gtk_file_dialog_select_folder (file_dialog, GTK_WINDOW (toplevel),
                                  NULL,
                                  add_file_chooser_response,
                                  self);
 }
 
 static void
-other_places_refresh (CcSearchLocationsDialog *self)
+other_places_refresh (CcSearchLocationsPage *self)
 {
   g_autoptr(GList) places = NULL;
   GList *l;
@@ -716,41 +741,8 @@ other_places_refresh (CcSearchLocationsDialog *self)
   update_list_visibility (self);
 }
 
-CcSearchLocationsDialog *
-cc_search_locations_dialog_new (void)
-{
-  CcSearchLocationsDialog *self;
-  GSettingsSchemaSource *source;
-  g_autoptr(GSettingsSchema) schema = NULL;
-
-  self = g_object_new (CC_SEARCH_LOCATIONS_DIALOG_TYPE, NULL);
-
-  source = g_settings_schema_source_get_default ();
-  schema = g_settings_schema_source_lookup (source, TRACKER3_SCHEMA, TRUE);
-  if (schema)
-    self->tracker_preferences = g_settings_new (TRACKER3_SCHEMA);
-  else
-    self->tracker_preferences = g_settings_new (TRACKER_SCHEMA);
-
-  populate_list_boxes (self);
-
-  gtk_list_box_set_sort_func (GTK_LIST_BOX (self->places_list),
-                              (GtkListBoxSortFunc) place_compare_func, NULL, NULL);
-  gtk_list_box_set_sort_func (GTK_LIST_BOX (self->bookmarks_list),
-                              (GtkListBoxSortFunc) place_compare_func, NULL, NULL);
-  gtk_list_box_set_sort_func (GTK_LIST_BOX (self->others_list),
-                              (GtkListBoxSortFunc) place_compare_func, NULL, NULL);
-
-  g_signal_connect_swapped (self->tracker_preferences, "changed::" TRACKER_KEY_RECURSIVE_DIRECTORIES,
-                            G_CALLBACK (other_places_refresh), self);
-  g_signal_connect_swapped (self->tracker_preferences, "changed::" TRACKER_KEY_SINGLE_DIRECTORIES,
-                            G_CALLBACK (other_places_refresh), self);
-
-  return self;
-}
-
 gboolean
-cc_search_locations_dialog_is_available (void)
+cc_search_locations_page_is_available (void)
 {
   GSettingsSchemaSource *source;
   g_autoptr(GSettingsSchema) schema = NULL;
@@ -771,25 +763,23 @@ cc_search_locations_dialog_is_available (void)
 }
 
 static void
-cc_search_locations_dialog_class_init (CcSearchLocationsDialogClass *klass)
+cc_search_locations_page_class_init (CcSearchLocationsPageClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
   GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->finalize = cc_search_locations_dialog_finalize;
+  object_class->finalize = cc_search_locations_page_finalize;
 
   gtk_widget_class_set_template_from_resource (widget_class,
-                                               "/org/gnome/control-center/search/cc-search-locations-dialog.ui");
+                                               "/org/gnome/control-center/search/cc-search-locations-page.ui");
 
-  gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsDialog, places_group);
-  gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsDialog, places_list);
-  gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsDialog, bookmarks_group);
-  gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsDialog, bookmarks_list);
-  gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsDialog, others_list);
-  gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsDialog, locations_add);
+  gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsPage, places_group);
+  gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsPage, places_list);
+  gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsPage, bookmarks_group);
+  gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsPage, bookmarks_list);
+  gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsPage, others_list);
+  gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsPage, locations_add);
 
   gtk_widget_class_bind_template_callback (widget_class, add_button_clicked);
   gtk_widget_class_bind_template_callback (widget_class, keynav_failed_cb);
-
-  gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0, "window.close", NULL);
 }
diff --git a/panels/search/cc-search-locations-dialog.h b/panels/search/cc-search-locations-page.h
similarity index 72%
rename from panels/search/cc-search-locations-dialog.h
rename to panels/search/cc-search-locations-page.h
index 9f47514ad22f60980564e48bdb0389fccede0bc3..6339028bb35b52f99a98c1aa8e49e052183c2e6f 100644
--- a/panels/search/cc-search-locations-dialog.h
+++ b/panels/search/cc-search-locations-page.h
@@ -22,9 +22,7 @@
 
 #include <adwaita.h>
 
-#define CC_SEARCH_LOCATIONS_DIALOG_TYPE (cc_search_locations_dialog_get_type ())
-G_DECLARE_FINAL_TYPE (CcSearchLocationsDialog, cc_search_locations_dialog, CC, SEARCH_LOCATIONS_DIALOG, AdwWindow)
+#define CC_TYPE_SEARCH_LOCATIONS_PAGE (cc_search_locations_page_get_type ())
+G_DECLARE_FINAL_TYPE (CcSearchLocationsPage, cc_search_locations_page, CC, SEARCH_LOCATIONS_PAGE, AdwNavigationPage)
 
-CcSearchLocationsDialog *cc_search_locations_dialog_new (void);
-
-gboolean cc_search_locations_dialog_is_available        (void);
+gboolean cc_search_locations_page_is_available        (void);
diff --git a/panels/search/cc-search-locations-dialog.ui b/panels/search/cc-search-locations-page.ui
similarity index 86%
rename from panels/search/cc-search-locations-dialog.ui
rename to panels/search/cc-search-locations-page.ui
index 143bfec796c8c047cdc85ab8cd8a70b574381334..ff391664159018fca80f63f0cf37e41f1fc6db09 100644
--- a/panels/search/cc-search-locations-dialog.ui
+++ b/panels/search/cc-search-locations-page.ui
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <template class="CcSearchLocationsDialog" parent="AdwWindow">
-    <property name="modal">True</property>
-    <property name="width-request">360</property>
-    <property name="height-request">294</property>
-    <property name="default-width">640</property>
-    <property name="default-height">576</property>
-    <property name="hide-on-close">True</property>
+  <template class="CcSearchLocationsPage" parent="AdwNavigationPage">
     <property name="title" translatable="yes">Search Locations</property>
-    <property name="content">
+    <property name="tag">locations</property>
+    <property name="child">
       <object class="AdwToolbarView">
         <child type="top">
           <object class="AdwHeaderBar"/>
@@ -23,7 +17,7 @@
                 <child>
                   <object class="GtkListBox" id="places_list">
                     <property name="selection-mode">none</property>
-                    <signal name="keynav-failed" handler="keynav_failed_cb" object="CcSearchLocationsDialog" swapped="yes"/>
+                    <signal name="keynav-failed" handler="keynav_failed_cb" object="CcSearchLocationsPage" swapped="yes"/>
                     <accessibility>
                       <relation name="labelled-by">places_group</relation>
                     </accessibility>
@@ -40,7 +34,7 @@
                 <child>
                   <object class="GtkListBox" id="bookmarks_list">
                     <property name="selection-mode">none</property>
-                    <signal name="keynav-failed" handler="keynav_failed_cb" object="CcSearchLocationsDialog" swapped="yes"/>
+                    <signal name="keynav-failed" handler="keynav_failed_cb" object="CcSearchLocationsPage" swapped="yes"/>
                     <accessibility>
                       <relation name="labelled-by">bookmarks_group</relation>
                     </accessibility>
@@ -64,7 +58,7 @@
                         <property name="use-underline">True</property>
                       </object>
                     </property>
-                    <signal name="clicked" handler="add_button_clicked" object="CcSearchLocationsDialog" swapped="yes"/>
+                    <signal name="clicked" handler="add_button_clicked" object="CcSearchLocationsPage" swapped="yes"/>
                     <style>
                       <class name="flat"/>
                     </style>
@@ -73,7 +67,7 @@
                 <child>
                   <object class="GtkListBox" id="others_list">
                     <property name="selection-mode">none</property>
-                    <signal name="keynav-failed" handler="keynav_failed_cb" object="CcSearchLocationsDialog" swapped="yes"/>
+                    <signal name="keynav-failed" handler="keynav_failed_cb" object="CcSearchLocationsPage" swapped="yes"/>
                     <accessibility>
                       <relation name="labelled-by">others_group</relation>
                     </accessibility>
diff --git a/panels/search/cc-search-panel.c b/panels/search/cc-search-panel.c
index 509c8dd1b61287e25405c671e2b0cd6667f76054..65182e55c014d3da1f44e4db49d2b7630b166aa9 100644
--- a/panels/search/cc-search-panel.c
+++ b/panels/search/cc-search-panel.c
@@ -21,7 +21,7 @@
 #include "cc-list-row.h"
 #include "cc-search-panel.h"
 #include "cc-search-panel-row.h"
-#include "cc-search-locations-dialog.h"
+#include "cc-search-locations-page.h"
 #include "cc-search-resources.h"
 
 #include <gio/gdesktopappinfo.h>
@@ -40,19 +40,13 @@ struct _CcSearchPanel
   GSettings        *search_settings;
   GHashTable       *sort_order;
 
-  CcSearchLocationsDialog  *locations_dialog;
+  CcSearchLocationsPage *locations_page;
 };
 
 CC_PANEL_REGISTER (CcSearchPanel, cc_search_panel)
 
-enum
-{
-  PROP_0,
-  PROP_PARAMETERS
-};
-
 #define SHELL_PROVIDER_GROUP "Shell Search Provider"
-#define SEARCH_LOCATIONS_DIALOG_PARAM "locations"
+#define SEARCH_LOCATIONS_PAGE_PARAM "locations"
 
 static gboolean
 keynav_failed_cb (CcSearchPanel *self, GtkDirectionType direction, GtkWidget *list)
@@ -280,26 +274,6 @@ row_moved_cb (CcSearchPanel    *self,
     search_panel_move_selected (self, down);
 }
 
-static void
-show_search_locations_dialog (CcSearchPanel *self)
-{
-  CcShell *shell;
-  GtkWidget *toplevel;
-
-  if (self->locations_dialog == NULL)
-    {
-      self->locations_dialog = cc_search_locations_dialog_new ();
-      g_object_add_weak_pointer (G_OBJECT (self->locations_dialog),
-                                 (gpointer *) &self->locations_dialog);
-
-      shell = cc_panel_get_shell (CC_PANEL (self));
-      toplevel = cc_shell_get_toplevel (shell);
-      gtk_window_set_transient_for (GTK_WINDOW (self->locations_dialog), GTK_WINDOW (toplevel));
-    }
-
-  gtk_window_present (GTK_WINDOW (self->locations_dialog));
-}
-
 static GVariant *
 switch_settings_mapping_set_generic (const GValue *value,
                                      const GVariantType *expected_type,
@@ -629,44 +603,6 @@ populate_search_providers (CcSearchPanel *self)
   g_task_run_in_thread (task, search_providers_discover_thread);
 }
 
-static void
-cc_search_panel_set_property (GObject      *object,
-                              guint         property_id,
-                              const GValue *value,
-                              GParamSpec   *pspec)
-{
-  switch (property_id)
-    {
-      case PROP_PARAMETERS:
-        {
-          GVariant *parameters = g_value_get_variant (value);
-          g_autoptr (GVariant) v = NULL;
-          const gchar *parameter = NULL;
-
-          if (parameters == NULL || g_variant_n_children (parameters) <= 0)
-            return;
-
-          g_variant_get_child (parameters, 0, "v", &v);
-          if (!g_variant_is_of_type (v, G_VARIANT_TYPE_STRING))
-            {
-              g_warning ("Wrong type for the second argument GVariant, expected 's' but got '%s'",
-                         (gchar *)g_variant_get_type (v));
-              return;
-            }
-
-          parameter = g_variant_get_string (v, NULL);
-
-          if (g_str_equal (parameter, SEARCH_LOCATIONS_DIALOG_PARAM))
-            show_search_locations_dialog (CC_SEARCH_PANEL (object));
-          else
-            g_warning ("Ignoring unknown parameter %s", parameter);
-
-          return;
-        }
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
 
 static void
 cc_search_panel_finalize (GObject *object)
@@ -676,9 +612,6 @@ cc_search_panel_finalize (GObject *object)
   g_clear_object (&self->search_settings);
   g_hash_table_destroy (self->sort_order);
 
-  if (self->locations_dialog)
-    gtk_window_destroy (GTK_WINDOW (self->locations_dialog));
-
   G_OBJECT_CLASS (cc_search_panel_parent_class)->finalize (object);
 }
 
@@ -686,13 +619,17 @@ static void
 cc_search_panel_init (CcSearchPanel *self)
 {
   g_resources_register (cc_search_get_resource ());
+  gboolean search_locations_available = FALSE;
 
   gtk_widget_init_template (GTK_WIDGET (self));
 
   gtk_list_box_set_sort_func (GTK_LIST_BOX (self->list_box),
                               (GtkListBoxSortFunc)list_sort_func, self, NULL);
 
-  gtk_widget_set_sensitive (self->settings_row, cc_search_locations_dialog_is_available ());
+  search_locations_available = cc_search_locations_page_is_available ();
+  gtk_widget_set_sensitive (self->settings_row, search_locations_available);
+  if (search_locations_available)
+    cc_panel_add_static_subpage (CC_PANEL (self), SEARCH_LOCATIONS_PAGE_PARAM, CC_TYPE_SEARCH_LOCATIONS_PAGE);
 
   self->search_settings = g_settings_new ("org.gnome.desktop.search-providers");
   g_settings_bind (self->search_settings,
@@ -725,12 +662,9 @@ cc_search_panel_class_init (CcSearchPanelClass *klass)
   GObjectClass *oclass = G_OBJECT_CLASS (klass);
 
   oclass->finalize = cc_search_panel_finalize;
-  oclass->set_property = cc_search_panel_set_property;
 
   g_type_ensure (CC_TYPE_LIST_ROW);
 
-  g_object_class_override_property (oclass, PROP_PARAMETERS, "parameters");
-
   gtk_widget_class_set_template_from_resource (widget_class,
                                                "/org/gnome/control-center/search/cc-search-panel.ui");
 
@@ -739,6 +673,5 @@ cc_search_panel_class_init (CcSearchPanelClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CcSearchPanel, search_group);
   gtk_widget_class_bind_template_child (widget_class, CcSearchPanel, settings_row);
 
-  gtk_widget_class_bind_template_callback (widget_class, show_search_locations_dialog);
   gtk_widget_class_bind_template_callback (widget_class, keynav_failed_cb);
 }
diff --git a/panels/search/cc-search-panel.ui b/panels/search/cc-search-panel.ui
index 4322e758911461bec28f2af94d5904c83ceead8b..562b63f0051ae1e23de6c16701705da2a03f95a3 100644
--- a/panels/search/cc-search-panel.ui
+++ b/panels/search/cc-search-panel.ui
@@ -1,65 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="CcSearchPanel" parent="CcPanel">
-    <property name="child">
-      <object class="AdwToolbarView">
-        <child type="top">
-          <object class="AdwHeaderBar"/>
-        </child>
+    <child type="subpage">
+      <object class="AdwNavigationPage">
+        <property name="title" translatable="yes">Search</property>
+        <child>
+          <object class="AdwToolbarView">
+            <child type="top">
+              <object class="AdwHeaderBar"/>
+            </child>
 
-        <property name="content">
-          <object class="AdwPreferencesPage">
-            <child>
-              <object class="AdwPreferencesGroup">
+            <property name="content">
+              <object class="AdwPreferencesPage">
                 <child>
-                  <object class="AdwSwitchRow" id="app_search_row">
-                    <property name="title" translatable="yes">_App Search</property>
-                    <property name="subtitle" translatable="yes">Include app-provided search results</property>
-                    <property name="use-underline">True</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcListRow" id="settings_row">
-                    <property name="title" translatable="yes">Search _Locations</property>
-                    <property name="subtitle" translatable="yes">Filesystem locations which are searched by system apps</property>
-                    <property name="show-arrow">True</property>
-                    <signal name="activated" handler="show_search_locations_dialog" object="CcSearchPanel" swapped="yes"/>
+                  <object class="AdwPreferencesGroup">
+                    <child>
+                      <object class="AdwSwitchRow" id="app_search_row">
+                        <property name="title" translatable="yes">_App Search</property>
+                        <property name="subtitle" translatable="yes">Include app-provided search results</property>
+                        <property name="use-underline">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="CcListRow" id="settings_row">
+                        <property name="title" translatable="yes">Search _Locations</property>
+                        <property name="subtitle" translatable="yes">Filesystem locations which are searched by system apps</property>
+                        <property name="show-arrow">True</property>
+                        <property name="action-name">navigation.push</property>
+                        <property name="action-target">'locations'</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="AdwPreferencesGroup" id="search_group">
-                <property name="title" translatable="yes">Search Results</property>
-                <property name="description" translatable="yes">Results are displayed according to the list order</property>
                 <child>
-                  <object class="GtkListBox" id="list_box">
-                    <property name="selection-mode">none</property>
-                    <signal name="keynav-failed" handler="keynav_failed_cb" object="CcSearchPanel" swapped="yes"/>
-                    <accessibility>
-                      <relation name="labelled-by">search_group</relation>
-                    </accessibility>
-                    <style>
-                      <class name="boxed-list"/>
-                    </style>
-                    <child type="placeholder">
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">No Apps Found</property>
-                        <property name="wrap">true</property>
-                        <property name="max-width-chars">50</property>
+                  <object class="AdwPreferencesGroup" id="search_group">
+                    <property name="title" translatable="yes">Search Results</property>
+                    <property name="description" translatable="yes">Results are displayed according to the list order</property>
+                    <child>
+                      <object class="GtkListBox" id="list_box">
+                        <property name="selection-mode">none</property>
+                        <signal name="keynav-failed" handler="keynav_failed_cb" object="CcSearchPanel" swapped="yes"/>
+                        <accessibility>
+                          <relation name="labelled-by">search_group</relation>
+                        </accessibility>
                         <style>
-                          <class name="dim-label" />
-                          <class name="cc-placeholder-row" />
+                          <class name="boxed-list"/>
                         </style>
+                        <child type="placeholder">
+                          <object class="GtkLabel">
+                            <property name="label" translatable="yes">No Apps Found</property>
+                            <property name="wrap">true</property>
+                            <property name="max-width-chars">50</property>
+                            <style>
+                              <class name="dim-label" />
+                              <class name="cc-placeholder-row" />
+                            </style>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
                 </child>
               </object>
-            </child>
+            </property>
           </object>
-        </property>
+        </child>
       </object>
-    </property>
+    </child>
   </template>
 </interface>
diff --git a/panels/search/meson.build b/panels/search/meson.build
index 5827d06bc4b27b3b2b53055b5707bdb967212d20..df1498e5b8d6e88223d799f13bc9ce7a2184cd15 100644
--- a/panels/search/meson.build
+++ b/panels/search/meson.build
@@ -12,7 +12,7 @@ i18n.merge_file(
 
 sources = files(
   'cc-search-panel.c',
-  'cc-search-locations-dialog.c',
+  'cc-search-locations-page.c',
   'cc-search-panel-row.c'
 )
 
diff --git a/panels/search/search.gresource.xml b/panels/search/search.gresource.xml
index 60c403ea5d88429cc7270fb7946b01d9aa89e744..ec13d291e8ba458800d841585861865d044a8814 100644
--- a/panels/search/search.gresource.xml
+++ b/panels/search/search.gresource.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/control-center/search">
-    <file preprocess="xml-stripblanks">cc-search-locations-dialog.ui</file>
+    <file preprocess="xml-stripblanks">cc-search-locations-page.ui</file>
     <file preprocess="xml-stripblanks">cc-search-panel.ui</file>
     <file preprocess="xml-stripblanks">cc-search-panel-row.ui</file>
   </gresource>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fcf72716505e7a1a9b46c8df5eca6df1cd6389f3..55236d3ea97d3b20b7dad9ee907d78d9118bd88c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -168,8 +168,8 @@ panels/privacy/location/cc-location-page.ui
 panels/privacy/screen/cc-screen-page.ui
 panels/privacy/usage/cc-usage-page.c
 panels/privacy/usage/cc-usage-page.ui
-panels/search/cc-search-locations-dialog.c
-panels/search/cc-search-locations-dialog.ui
+panels/search/cc-search-locations-page.c
+panels/search/cc-search-locations-page.ui
 panels/search/cc-search-panel-row.ui
 panels/search/cc-search-panel.ui
 panels/search/gnome-search-panel.desktop.in