diff --git a/tasks/task_database.c b/tasks/task_database.c
index 026a8d5849..0919499293 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -1115,6 +1115,35 @@ static void task_database_handler(retro_task_t *task)
             dbstate->list        = dir_list_new_special(
                   db->content_database_path,
                   DIR_LIST_DATABASES, NULL);
+
+            /* If the scan path matches a database path exactly then
+             * save time by only processing that database. */
+            if (dbstate->list && db->is_directory)
+            {
+               char *dirname = find_last_slash(db->fullpath) + 1;
+
+               for (size_t i = 0; i < dbstate->list->size; i++)
+               {
+                  char *dbpath = strdup(dbstate->list->elems[i].data);
+                  path_remove_extension(dbpath);
+                  char *dbname = find_last_slash(dbpath) + 1;
+
+                  if (strcasecmp(dbname, dirname) == 0)
+                  {
+                     free(dbpath);
+                     struct string_list *single_list = string_list_new();
+                     string_list_append(single_list, dbstate->list->elems[i].data,
+                        dbstate->list->elems[i].attr);
+                     dir_list_free(dbstate->list);
+                     dbstate->list = single_list;
+                     break;
+                  }
+                  else
+                  {
+                     free(dbpath);
+                  }
+               }
+            }
          }
          dbinfo->status = DATABASE_STATUS_ITERATE_START;
          break;