diff --git a/core/libs/database/utils/ifaces/diofinders.cpp b/core/libs/database/utils/ifaces/diofinders.cpp
index 06b1d05aee..45a1ff4371 100644
--- a/core/libs/database/utils/ifaces/diofinders.cpp
+++ b/core/libs/database/utils/ifaces/diofinders.cpp
@@ -1,154 +1,137 @@
 /* ============================================================
  *
  * This file is a part of digiKam project
  * https://www.digikam.org
  *
  * Date        : 2005-05-17
  * Description : low level files management interface - Finder classes
  *
  * Copyright (C) 2005      by Renchi Raju <renchi dot raju at gmail dot com>
  * Copyright (C) 2012-2013 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  * Copyright (C) 2015      by Mohamed_Anwer <m_dot_anwer at gmx dot com>
  * Copyright (C) 2018      by Maik Qualmann <metzpinguin at gmail dot com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * ============================================================ */
 
 #include "diofinders.h"
 
 // Qt includes
 
 #include <QFileInfo>
 #include <QSet>
 
 // Local includes
 
 #include "digikam_debug.h"
 #include "iteminfo.h"
 #include "metaenginesettings.h"
 
 namespace Digikam
 {
 
 SidecarFinder::SidecarFinder(const QList<QUrl>& files)
 {
     // First, the sidecar urls will be added so that they are first copied or renamed.
 
-    const QString xmp(QLatin1String(".xmp"));
+    QStringList sidecarExtensions;
+    sidecarExtensions << QLatin1String("xmp");
+    sidecarExtensions << MetaEngineSettings::instance()->settings().sidecarExtensions;
 
     foreach (const QUrl& url, files)
     {
         QFileInfo info(url.toLocalFile());
 
-        if (!info.filePath().endsWith(xmp))
+        foreach (const QString& ext, sidecarExtensions)
         {
-            QFileInfo extInfo(info.filePath() + xmp);
-            QFileInfo basInfo(info.path()             +
-                              QLatin1Char('/')        +
-                              info.completeBaseName() + xmp);
-
-            if (extInfo.exists())
-            {
-                localFiles        << QUrl::fromLocalFile(extInfo.filePath());
-                localFileModes    << true;
-                localFileSuffixes << xmp;
-                qCDebug(DIGIKAM_DATABASE_LOG) << "Detected a sidecar" << localFiles.last();
-            }
+            QString suffix(QLatin1Char('.') + ext);
 
-            if (basInfo.exists())
+            if (info.filePath().endsWith(suffix))
             {
-                localFiles        << QUrl::fromLocalFile(basInfo.filePath());
-                localFileModes    << false;
-                localFileSuffixes << xmp;
-                qCDebug(DIGIKAM_DATABASE_LOG) << "Detected a sidecar" << localFiles.last();
+                continue;
             }
-        }
-
-        foreach (const QString& ext, MetaEngineSettings::instance()->settings().sidecarExtensions)
-        {
-            QString suffix(QLatin1Char('.') + ext);
 
             QFileInfo extInfo(info.filePath() + suffix);
             QFileInfo basInfo(info.path()             +
                               QLatin1Char('/')        +
                               info.completeBaseName() + suffix);
 
             if (extInfo.exists() && !localFiles.contains(QUrl::fromLocalFile(extInfo.filePath())))
             {
                 localFiles        << QUrl::fromLocalFile(extInfo.filePath());
                 localFileModes    << true;
                 localFileSuffixes << suffix;
                 qCDebug(DIGIKAM_DATABASE_LOG) << "Detected a sidecar" << localFiles.last();
             }
 
             if (basInfo.exists() && !localFiles.contains(QUrl::fromLocalFile(basInfo.filePath())))
             {
                 localFiles        << QUrl::fromLocalFile(basInfo.filePath());
                 localFileModes    << false;
                 localFileSuffixes << suffix;
                 qCDebug(DIGIKAM_DATABASE_LOG) << "Detected a sidecar" << localFiles.last();
             }
         }
     }
 
     // Now the files, if the user has selected sidecars, these are ignored.
 
     foreach (const QUrl& url, files)
     {
         if (!localFiles.contains(url))
         {
             localFiles        << url;
             localFileModes    << true;
             localFileSuffixes << QString();
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 
 /**
  * TODO: Groups should not be resolved in dio, it should be handled in views.
  * This is already done for most things except for drag&drop, which is hard :)
  */
 GroupedImagesFinder::GroupedImagesFinder(const QList<ItemInfo>& source)
 {
     QSet<qlonglong> ids;
 
     foreach (const ItemInfo& info, source)
     {
         ids << info.id();
     }
 
     infos.reserve(source.size());
 
     foreach (const ItemInfo& info, source)
     {
         infos << info;
 
         if (info.hasGroupedImages())
         {
             foreach (const ItemInfo& groupedImage, info.groupedImages())
             {
                 if (ids.contains(groupedImage.id()))
                 {
                     continue;
                 }
 
                 infos << groupedImage;
                 ids   << groupedImage.id();
             }
         }
     }
 }
 
 } // namespace Digikam