diff --git a/notesagent/notesagent.cpp b/notesagent/notesagent.cpp
index a1a739c..780d173 100644
--- a/notesagent/notesagent.cpp
+++ b/notesagent/notesagent.cpp
@@ -1,188 +1,189 @@
 /*
    Copyright (C) 2013-2019 Montel Laurent <montel@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) 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.
 
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "notesagent.h"
 #include "notesagentadaptor.h"
 #include "notesagentsettings.h"
 #include "notesagentsettingsdialog.h"
 #include "notesharedglobalconfig.h"
 #include "notesmanager.h"
 
 #include <AkonadiCore/ServerManager>
 
 #include <Kdelibs4ConfigMigrator>
 
 #include <KDBusConnectionPool>
 #include <KWindowSystem>
 
 NotesAgent::NotesAgent(const QString &id)
     : Akonadi::AgentBase(id)
     , mAgentInitialized(false)
 {
     Kdelibs4ConfigMigrator migrate(QStringLiteral("notesagent"));
     migrate.setConfigFiles(QStringList()
                            << QStringLiteral("akonadi_notes_agentrc")
                            << QStringLiteral("akonadi_notes_agent.notifyrc"));
     migrate.migrate();
 
     mNotesManager = new NotesManager(this);
     new NotesAgentAdaptor(this);
     KDBusConnectionPool::threadConnection().registerObject(QStringLiteral("/NotesAgent"),
                                                            this, QDBusConnection::ExportAdaptors);
 
     QString service = QStringLiteral("org.freedesktop.Akonadi.NotesAgent");
     if (Akonadi::ServerManager::hasInstanceIdentifier()) {
         service += QLatin1Char('.') + Akonadi::ServerManager::instanceIdentifier();
     }
 
     KDBusConnectionPool::threadConnection().registerService(service);
 
     setNeedsNetwork(true);
 
     if (NotesAgentSettings::enabled()) {
         QTimer::singleShot(60 * 1000, this, &NotesAgent::slotStartAgent);
     }
 }
 
 NotesAgent::~NotesAgent()
 {
 }
 
 void NotesAgent::doSetOnline(bool online)
 {
     if (mAgentInitialized) {
         if (online) {
             reload();
         } else {
             mNotesManager->stopAll();
         }
     }
 }
 
 void NotesAgent::slotStartAgent()
 {
     mAgentInitialized = true;
     if (isOnline()) {
         mNotesManager->load();
     }
 }
 
 void NotesAgent::reload()
 {
     if (NotesAgentSettings::enabled()) {
         mNotesManager->load();
     }
 }
 
 void NotesAgent::setEnableAgent(bool enabled)
 {
     if (NotesAgentSettings::enabled() == enabled) {
         return;
     }
 
     NotesAgentSettings::setEnabled(enabled);
     NotesAgentSettings::self()->save();
     if (enabled) {
         mNotesManager->load();
     } else {
         mNotesManager->stopAll();
     }
 }
 
 bool NotesAgent::enabledAgent() const
 {
     return NotesAgentSettings::enabled();
 }
 
 void NotesAgent::configure(WId windowId)
 {
     showConfigureDialog((qlonglong)windowId);
 }
 
 void NotesAgent::showConfigureDialog(qlonglong windowId)
 {
     QPointer<NotesAgentSettingsDialog> dialog = new NotesAgentSettingsDialog;
     if (windowId) {
+        dialog->setAttribute(Qt::WA_NativeWindow, true);
         KWindowSystem::setMainWindow(dialog->windowHandle(), windowId);
     }
     if (dialog->exec()) {
         mNotesManager->load();
     }
     delete dialog;
 }
 
 bool NotesAgent::receiveNotes() const
 {
     return NoteShared::NoteSharedGlobalConfig::receiveNotes();
 }
 
 void NotesAgent::setReceiveNotes(bool b)
 {
     if (NoteShared::NoteSharedGlobalConfig::receiveNotes() != b) {
         NoteShared::NoteSharedGlobalConfig::setReceiveNotes(b);
         NoteShared::NoteSharedGlobalConfig::self()->save();
         mNotesManager->updateNetworkListener();
     }
 }
 
 int NotesAgent::port() const
 {
     return NoteShared::NoteSharedGlobalConfig::port();
 }
 
 void NotesAgent::setPort(int value)
 {
     if (value < 0) {
         return;
     }
 
     if (NoteShared::NoteSharedGlobalConfig::port() != static_cast<uint>(value)) {
         NoteShared::NoteSharedGlobalConfig::setPort(value);
         NoteShared::NoteSharedGlobalConfig::self()->save();
         if (NotesAgentSettings::enabled()) {
             mNotesManager->updateNetworkListener();
         }
     }
 }
 
 void NotesAgent::setAlarmCheckInterval(int value)
 {
     if (value < 0) {
         return;
     }
 
     if (NoteShared::NoteSharedGlobalConfig::checkInterval() != static_cast<uint>(value)) {
         NoteShared::NoteSharedGlobalConfig::setCheckInterval(value);
         NoteShared::NoteSharedGlobalConfig::self()->save();
         reload();
     }
 }
 
 void NotesAgent::configurationChanged()
 {
     NoteShared::NoteSharedGlobalConfig::self()->config()->reparseConfiguration();
     mNotesManager->updateNetworkListener();
 }
 
 int NotesAgent::alarmCheckInterval() const
 {
     return NoteShared::NoteSharedGlobalConfig::checkInterval();
 }
 
 AKONADI_AGENT_MAIN(NotesAgent)