diff --git a/app/flatpak-builtins-list-remotes.c b/app/flatpak-builtins-list-remotes.c
index 374606fd..9965afbc 100644
--- a/app/flatpak-builtins-list-remotes.c
+++ b/app/flatpak-builtins-list-remotes.c
@@ -150,16 +150,7 @@ flatpak_builtin_list_remotes (int argc, char **argv, GCancellable *cancellable,
               if ((opt_user && opt_system) || (opt_user && opt_installation != NULL)
                   || (opt_system && opt_installation != NULL))
                 {
-                  g_autofree char *dir_id = NULL;
-                  if (flatpak_dir_is_user (dir))
-                    {
-                      dir_id = g_strdup ("user");
-                    }
-                  else
-                    {
-                      const char *system_dir_id = flatpak_dir_get_id (dir);
-                      dir_id = g_strdup_printf ("system (%s)", system_dir_id ? system_dir_id : "default");
-                    }
+                  g_autofree char *dir_id = flatpak_dir_get_name (dir);
                   flatpak_table_printer_append_with_comma (printer, dir_id);
                 }
             }
diff --git a/app/flatpak-builtins-list.c b/app/flatpak-builtins-list.c
index 1f28d584..ef4c5a20 100644
--- a/app/flatpak-builtins-list.c
+++ b/app/flatpak-builtins-list.c
@@ -198,17 +198,7 @@ print_table_for_refs (gboolean print_apps, GPtrArray* refs_array, const char *ar
 
               if (refs_array->len > 1)
                 {
-                  g_autofree char *source = NULL;
-                  if (flatpak_dir_is_user (dir))
-                    {
-                      source = g_strdup ("user");
-                    }
-                  else
-                    {
-                      const char *system_source = flatpak_dir_get_id (dir);
-                      source = g_strdup_printf ("system (%s)", system_source ? system_source : "default");
-                    }
-
+                  g_autofree char *source = flatpak_dir_get_name (dir);
                   flatpak_table_printer_append_with_comma (printer, source);
                 }
 
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index b056fe91..4a75de16 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -780,6 +780,21 @@ flatpak_dir_get_id (FlatpakDir *self)
   return NULL;
 }
 
+char *
+flatpak_dir_get_name (FlatpakDir *self)
+{
+  const char *id = NULL;
+
+  if (self->user)
+    return g_strdup ("user");
+
+  id = flatpak_dir_get_id (self);
+  if (id != NULL && g_strcmp0 (id, "default") != 0)
+    return g_strdup_printf ("system (%s)", id);
+
+  return g_strdup ("system");
+}
+
 const char *
 flatpak_dir_get_display_name (FlatpakDir *self)
 {
diff --git a/common/flatpak-dir.h b/common/flatpak-dir.h
index 966661e2..f8dae23b 100644
--- a/common/flatpak-dir.h
+++ b/common/flatpak-dir.h
@@ -165,6 +165,7 @@ GFile *     flatpak_dir_get_path (FlatpakDir *self);
 GFile *     flatpak_dir_get_changed_path (FlatpakDir *self);
 const char *flatpak_dir_get_id (FlatpakDir *self);
 const char *flatpak_dir_get_display_name (FlatpakDir *self);
+char *      flatpak_dir_get_name (FlatpakDir *self);
 gint        flatpak_dir_get_priority (FlatpakDir *self);
 FlatpakDirStorageType flatpak_dir_get_storage_type (FlatpakDir *self);
 GFile *     flatpak_dir_get_deploy_dir (FlatpakDir *self,