diff --git a/activities/fileitemplugin/FileItemLinkingPluginActionLoader.cpp b/activities/fileitemplugin/FileItemLinkingPluginActionLoader.cpp
index 29d74245..753359bf 100644
--- a/activities/fileitemplugin/FileItemLinkingPluginActionLoader.cpp
+++ b/activities/fileitemplugin/FileItemLinkingPluginActionLoader.cpp
@@ -1,199 +1,208 @@
 /*
  *   Copyright (C) 2012 - 2016 by Ivan Cukic <ivan.cukic@kde.org>
  *
  *   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 of
  *   the License or (at your option) version 3 or any later version
  *   accepted by the membership of KDE e.V. (or its successor approved
  *   by the membership of KDE e.V.), which shall act as a proxy
  *   defined in Section 14 of version 3 of the license.
  *
  *   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.
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "FileItemLinkingPluginActionLoader.h"
 
 #include <kfileitemlistproperties.h>
 #include <utils/d_ptr_implementation.h>
 #include <utils/qsqlquery_iterator.h>
 
 #include <QMenu>
 #include <QCursor>
 #include <QDebug>
 #include <QFileInfo>
 #include <QSqlDatabase>
 #include <QSqlQuery>
 #include <QSqlField>
 #include <QSqlError>
 #include <QSqlDriver>
 #include <QStandardPaths>
 #include <QDBusPendingCall>
 
 #include <KPluginFactory>
 #include <KLocalizedString>
 
 #include "common/dbus/common.h"
 
 FileItemLinkingPluginActionLoader* FileItemLinkingPluginActionLoader::create(const KFileItemListProperties &items)
 {
     auto l = new FileItemLinkingPluginActionLoader(items);
     connect(l, &QThread::finished, l, &QObject::deleteLater);
     return l;
 }
 
 FileItemLinkingPluginActionLoader::FileItemLinkingPluginActionLoader(
     const KFileItemListProperties &items)
     : items(items)
 {
 }
 
 void FileItemLinkingPluginActionLoader::run()
 {
     ActionList actions;
 
     const auto activitiesList = activities.activities();
     const auto itemsSize = items.urlList().size();
 
     if (itemsSize >= 10) {
         // we are not going to check for this large number of files
         actions << createAction(QString(), true,
                                 i18n("Link to the current activity"),
                                 "list-add");
         actions << createAction(QString(), false,
                                 i18n("Unlink from the current activity"),
                                 "list-remove");
 
         actions << createSeparator(i18n("Link to:"));
         for (const auto& activity: activitiesList) {
             actions << createAction(activity, true);
         }
 
         actions << createSeparator(i18n("Unlink from:"));
         for (const auto& activity: activitiesList) {
             actions << createAction(activity, false);
         }
 
     } else {
-        auto database = QSqlDatabase::addDatabase(
-            QStringLiteral("QSQLITE"),
+        auto connectionName =
             QStringLiteral("kactivities_db_resources_")
-            + QString::number((quintptr) this));
-
-        database.setDatabaseName(
-            QStandardPaths::writableLocation(
-                QStandardPaths::GenericDataLocation)
-            + QStringLiteral("/kactivitymanagerd/resources/database"));
-
-        if (database.open()) {
-
-            static const auto queryString = QStringLiteral(
-                "SELECT usedActivity, COUNT(targettedResource) "
-                "FROM ResourceLink "
-                "WHERE targettedResource IN (%1) "
-                    "AND initiatingAgent = \":global\" "
-                    "AND usedActivity != \":global\" "
-                "GROUP BY usedActivity");
-
-            QStringList escapedFiles;
-            QSqlField field;
-            field.setType(QVariant::String);
-
-            for (const auto& item: items.urlList()) {
-                field.setValue(QFileInfo(item.toLocalFile()).canonicalFilePath());
-                escapedFiles << database.driver()->formatValue(field);
-            }
+            + QString::number((quintptr) this);
+
+        {
+            auto database = QSqlDatabase::addDatabase(
+                QStringLiteral("QSQLITE"),
+                connectionName);
+
+            database.setDatabaseName(
+                QStandardPaths::writableLocation(
+                    QStandardPaths::GenericDataLocation)
+                + QStringLiteral("/kactivitymanagerd/resources/database"));
+
+            if (database.open()) {
+
+                static const auto queryString = QStringLiteral(
+                    "SELECT usedActivity, COUNT(targettedResource) "
+                    "FROM ResourceLink "
+                    "WHERE targettedResource IN (%1) "
+                        "AND initiatingAgent = \":global\" "
+                        "AND usedActivity != \":global\" "
+                    "GROUP BY usedActivity");
+
+                QStringList escapedFiles;
+                QSqlField field;
+                field.setType(QVariant::String);
+
+                for (const auto& item: items.urlList()) {
+                    field.setValue(QFileInfo(item.toLocalFile()).canonicalFilePath());
+                    escapedFiles << database.driver()->formatValue(field);
+                }
 
-            QSqlQuery query(queryString.arg(escapedFiles.join(",")),
-                            database);
+                QSqlQuery query(queryString.arg(escapedFiles.join(",")),
+                                database);
 
-            QStringList activitiesForLinking;
-            QStringList activitiesForUnlinking;
+                QStringList activitiesForLinking;
+                QStringList activitiesForUnlinking;
 
-            for (const auto& result: query) {
-                const auto linkedFileCount = result[1].toInt();
-                const auto activity = result[0].toString();
-                if (linkedFileCount < itemsSize) {
-                    activitiesForLinking << activity;
-                }
+                for (const auto& result: query) {
+                    const auto linkedFileCount = result[1].toInt();
+                    const auto activity = result[0].toString();
+                    if (linkedFileCount < itemsSize) {
+                        activitiesForLinking << activity;
+                    }
 
-                if (linkedFileCount > 0) {
-                    activitiesForUnlinking << activity;
+                    if (linkedFileCount > 0) {
+                        activitiesForUnlinking << activity;
+                    }
                 }
-            }
 
-            if (activitiesForLinking.contains(activities.currentActivity()) ||
-                    !activitiesForUnlinking.contains(activities.currentActivity())) {
-                actions << createAction(QString(), true,
-                                        i18n("Link to the current activity"),
-                                        "list-add");
-            }
-            if (activitiesForUnlinking.contains(activities.currentActivity())) {
-                actions << createAction(QString(), false,
-                                        i18n("Unlink from the current activity"),
-                                        "list-remove");
-            }
+                if (activitiesForLinking.contains(activities.currentActivity()) ||
+                        !activitiesForUnlinking.contains(activities.currentActivity())) {
+                    actions << createAction(QString(), true,
+                                            i18n("Link to the current activity"),
+                                            "list-add");
+                }
+                if (activitiesForUnlinking.contains(activities.currentActivity())) {
+                    actions << createAction(QString(), false,
+                                            i18n("Unlink from the current activity"),
+                                            "list-remove");
+                }
 
-            actions << createSeparator(i18n("Link to:"));
-            for (const auto& activity: activitiesList) {
-                if (activitiesForLinking.contains(activity) ||
-                        !activitiesForUnlinking.contains(activity)) {
-                    actions << createAction(activity, true);
+                actions << createSeparator(i18n("Link to:"));
+                for (const auto& activity: activitiesList) {
+                    if (activitiesForLinking.contains(activity) ||
+                            !activitiesForUnlinking.contains(activity)) {
+                        actions << createAction(activity, true);
+                    }
                 }
-            }
 
-            actions << createSeparator(i18n("Unlink from:"));
-            for (const auto& activity: activitiesList) {
-                if (activitiesForUnlinking.contains(activity)) {
-                    actions << createAction(activity, false);
+                actions << createSeparator(i18n("Unlink from:"));
+                for (const auto& activity: activitiesList) {
+                    if (activitiesForUnlinking.contains(activity)) {
+                        actions << createAction(activity, false);
+                    }
                 }
+
+                database.close();
             }
         }
+
+        QSqlDatabase::removeDatabase(connectionName);
     }
 
     emit result(actions);
 }
 
 Action
 FileItemLinkingPluginActionLoader::createAction(const QString &activity,
                                                 bool link, const QString &title,
                                                 const QString &icon) const
 {
     Action action = { };
     action.link = link;
 
     if (title.isEmpty()) {
         KActivities::Info activityInfo(activity);
         action.title = activityInfo.name();
         action.icon  = activityInfo.icon().isEmpty() ? "activities"
                                                      : activityInfo.icon();
 
     } else {
         action.title = title;
     }
 
     if (!icon.isEmpty()) {
         action.icon = icon;
     }
 
     action.activity = activity.isEmpty() ? activities.currentActivity()
                                          : activity;
 
     return action;
 }
 
 Action
 FileItemLinkingPluginActionLoader::createSeparator(const QString &title) const
 {
     Action action = { };
     action.icon = "-";
     action.title = title;
     return action;
 }