diff --git a/indicator/main.cpp b/indicator/main.cpp
index 1e7b54fa..738d56ce 100644
--- a/indicator/main.cpp
+++ b/indicator/main.cpp
@@ -1,217 +1,221 @@
 /*
  * Copyright 2016 Aleix Pol Gonzalez <aleixpol@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 <https://www.gnu.org/licenses/>.
  */
 
 #include <QApplication>
 #include <QProcess>
 #include <QThread>
 #include <QMessageBox>
 
 #ifdef QSYSTRAY
 #include <QSystemTrayIcon>
 #else
 #include <KStatusNotifierItem>
 #endif
 
 #include <KDBusService>
 #include <KAboutData>
 #include <KCMultiDialog>
 #include <KLocalizedString>
 
 #include "interfaces/devicesmodel.h"
 #include "interfaces/dbusinterfaces.h"
 #include "kdeconnect-version.h"
 #include "deviceindicator.h"
 
 #include <dbushelper.h>
 
 int main(int argc, char** argv)
 {
     QApplication app(argc, argv);
     KAboutData about(QStringLiteral("kdeconnect-indicator"),
                      i18n("KDE Connect Indicator"),
                      QStringLiteral(KDECONNECT_VERSION_STRING),
                      i18n("KDE Connect Indicator tool"),
                      KAboutLicense::GPL,
                      i18n("(C) 2016 Aleix Pol Gonzalez"));
     KAboutData::setApplicationData(about);
 
 #ifdef Q_OS_WIN
     QProcess kdeconnectd;
     kdeconnectd.start(QStringLiteral("kdeconnectd.exe"));
 #endif
 
 #ifdef Q_OS_MAC
     // Unset launchctl env, avoid block
     DBusHelper::macosUnsetLaunchctlEnv();
-    
+
     // Start kdeconnectd
     QProcess kdeconnectdProcess;
     if (QFile::exists(QCoreApplication::applicationDirPath() + QStringLiteral("/kdeconnectd"))) {
         kdeconnectdProcess.startDetached(QCoreApplication::applicationDirPath() + QStringLiteral("/kdeconnectd"));
     } else if (QFile::exists(QString::fromLatin1(qgetenv("craftRoot")) + QStringLiteral("/../lib/libexec/kdeconnectd"))) {
         kdeconnectdProcess.startDetached(QString::fromLatin1(qgetenv("craftRoot")) + QStringLiteral("/../lib/libexec/kdeconnectd"));
     } else {
         QMessageBox::critical(nullptr, i18n("KDE Connect"),
                               i18n("Cannot find kdeconnectd"),
                               QMessageBox::Abort,
                               QMessageBox::Abort);
         return -1;
     }
 
     // Wait for dbus daemon env
     QProcess getLaunchdDBusEnv;
     int retry = 0;
     do {
         getLaunchdDBusEnv.setProgram(QStringLiteral("launchctl"));
         getLaunchdDBusEnv.setArguments({
             QStringLiteral("getenv"),
             QStringLiteral(KDECONNECT_SESSION_DBUS_LAUNCHD_ENV)
         });
         getLaunchdDBusEnv.start();
         getLaunchdDBusEnv.waitForFinished();
 
         QString launchdDBusEnv = QString::fromLocal8Bit(getLaunchdDBusEnv.readAllStandardOutput());
 
         if (launchdDBusEnv.length() > 0) {
             break;
         } else if (retry >= 10) {
             // Show a warning and exit
             qCritical() << "Fail to get launchctl" << KDECONNECT_SESSION_DBUS_LAUNCHD_ENV << "env";
 
             QMessageBox::critical(nullptr, i18n("KDE Connect"),
                                   i18n("Cannot connect to DBus\n"
                                   "KDE Connect will quit"),
                                   QMessageBox::Abort,
                                   QMessageBox::Abort);
 
             return -1;
         } else {
             QThread::sleep(1);  // Retry after 1s
             retry++;
         }
     } while(true);
 #endif
 
     KDBusService dbusService(KDBusService::Unique);
 
     DevicesModel model;
     model.setDisplayFilter(DevicesModel::Reachable | DevicesModel::Paired);
     QMenu* menu = new QMenu;
 
     DaemonDbusInterface iface;
     auto refreshMenu = [&iface, &model, &menu]() {
         menu->clear();
         auto configure = menu->addAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("Configure..."));
         QObject::connect(configure, &QAction::triggered, configure, [](){
             KCMultiDialog* dialog = new KCMultiDialog;
             dialog->addModule(QStringLiteral("kcm_kdeconnect"));
             dialog->setAttribute(Qt::WA_DeleteOnClose);
             dialog->show();
         });
         for (int i=0, count = model.rowCount(); i<count; ++i) {
             DeviceDbusInterface* device = model.getDevice(i);
             auto indicator = new DeviceIndicator(device);
             QObject::connect(device, &DeviceDbusInterface::destroyed, indicator, &QObject::deleteLater);
 
             menu->addMenu(indicator);
         }
         const QStringList requests = iface.pairingRequests();
         if (!requests.isEmpty()) {
             menu->addSection(i18n("Pairing requests"));
 
             for(const auto& req: requests) {
                 DeviceDbusInterface* dev = new DeviceDbusInterface(req, menu);
                 auto pairMenu = menu->addMenu(dev->name());
                 pairMenu->addAction(i18n("Pair"), dev, &DeviceDbusInterface::acceptPairing);
                 pairMenu->addAction(i18n("Reject"), dev, &DeviceDbusInterface::rejectPairing);
             }
         }
 
 #if (defined Q_OS_MAC || defined Q_OS_WIN)
         // Add quit menu
         menu->addAction(i18n("Quit"), [](){
             auto message = QDBusMessage::createMethodCall(QStringLiteral("org.kde.kdeconnect.daemon"),
                                                         QStringLiteral("/MainApplication"),
                                                         QStringLiteral("org.qtproject.Qt.QCoreApplication"),
                                                         QStringLiteral("quit"));
-            DBusHelper::sessionBus().call(message);
-            QCoreApplication::quit();   // Close this application
+            DBusHelper::sessionBus().call(message, QDBus::NoBlock); // Close our daemon
+            message = QDBusMessage::createMethodCall(qApp->applicationName(),
+                                                        QStringLiteral("/MainApplication"),
+                                                        QStringLiteral("org.qtproject.Qt.QCoreApplication"),
+                                                        QStringLiteral("quit"));
+            DBusHelper::sessionBus().call(message, QDBus::NoBlock); // Close our indicator
         });
 #endif
     };
 
     QObject::connect(&iface, &DaemonDbusInterface::pairingRequestsChangedProxy, &model, refreshMenu);
     QObject::connect(&model, &DevicesModel::rowsInserted, &model, refreshMenu);
     QObject::connect(&model, &DevicesModel::rowsRemoved, &model, refreshMenu);
 
 #ifdef Q_OS_MAC
     const QString iconPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("icons"), QStandardPaths::LocateDirectory);
     if (!iconPath.isNull()) {
         QStringList themeSearchPaths = QIcon::themeSearchPaths();
         themeSearchPaths << iconPath;
         QIcon::setThemeSearchPaths(themeSearchPaths);
     }
 #endif
 
 #ifdef QSYSTRAY
     QSystemTrayIcon systray;
 #ifdef Q_OS_WIN
     systray.setIcon(QIcon(QStandardPaths::locate(QStandardPaths::AppLocalDataLocation, QStringLiteral("icons/hicolor/scalable/apps/kdeconnectindicatorwin.svg"))));
 #else
     systray.setIcon(QIcon::fromTheme(QStringLiteral("kdeconnectindicatordark")));
 #endif
     systray.setVisible(true);
     systray.setToolTip(QStringLiteral("KDE Connect"));
     QObject::connect(&model, &DevicesModel::rowsChanged, &model, [&systray, &model]() {
         systray.setToolTip(i18np("%1 device connected", "%1 devices connected", model.rowCount()));
     });
 
     systray.setContextMenu(menu);
 #else
     KStatusNotifierItem systray;
 #ifdef Q_OS_MAC
     if (!iconPath.isNull()) {
         systray.setIconByName(QStringLiteral("kdeconnectindicatordark"));
     } else {
         // We are in macOS dev env, just continue
         qWarning() << "Fail to find indicator icon, continue anyway";
     }
 #else
     systray.setIconByName(QStringLiteral("kdeconnectindicatordark"));
 #endif
     systray.setToolTip(QStringLiteral("kdeconnect"), QStringLiteral("KDE Connect"), QStringLiteral("KDE Connect"));
     systray.setCategory(KStatusNotifierItem::Communications);
     systray.setStatus(KStatusNotifierItem::Passive);
     systray.setStandardActionsEnabled(false);
     QObject::connect(&model, &DevicesModel::rowsChanged, &model, [&systray, &model]() {
         const auto count = model.rowCount();
         systray.setStatus(count == 0 ? KStatusNotifierItem::Passive : KStatusNotifierItem::Active);
         systray.setToolTip(QStringLiteral("kdeconnect"), QStringLiteral("KDE Connect"), i18np("%1 device connected", "%1 devices connected", count));
     });
 
     systray.setContextMenu(menu);
 #endif
 
     refreshMenu();
 
     app.setQuitOnLastWindowClosed(false);
 
     return app.exec();
 }