diff --git a/containments/taskpanel/taskpanel.cpp b/containments/taskpanel/taskpanel.cpp
index 1f8b84e..777e592 100644
--- a/containments/taskpanel/taskpanel.cpp
+++ b/containments/taskpanel/taskpanel.cpp
@@ -1,188 +1,188 @@
 /***************************************************************************
  *   Copyright (C) 2015 Marco Martin <mart@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; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
 #include "taskpanel.h"
 
 #include <QtQml>
 #include <QDebug>
 #include <QQuickItem>
 #include <QQuickWindow>
 
 #include <Plasma/Package>
 
 #include <KWayland/Client/connection_thread.h>
 #include <KWayland/Client/plasmawindowmanagement.h>
 #include <KWayland/Client/plasmawindowmodel.h>
 #include <KWayland/Client/plasmashell.h>
 #include <KWayland/Client/registry.h>
 #include <KWayland/Client/surface.h>
 
 static const QString s_kwinService = QStringLiteral("org.kde.KWin");
 
 TaskPanel::TaskPanel(QObject *parent, const QVariantList &args)
     : Plasma::Containment(parent, args)
     , m_showingDesktop(false)
     , m_windowManagement(nullptr)
 {
     setHasConfigurationInterface(true);
-    initWayland();
     m_activeTimer = new QTimer(this);
     m_activeTimer->setSingleShot(true);
     m_activeTimer->setInterval(250);
     connect(m_activeTimer, &QTimer::timeout, this, &TaskPanel::updateActiveWindow);
+    initWayland();
 }
 
 TaskPanel::~TaskPanel()
 {
 }
 
 void TaskPanel::requestShowingDesktop(bool showingDesktop)
 {
     if (!m_windowManagement) {
         return;
     }
     m_windowManagement->setShowingDesktop(showingDesktop);
 }
 
 void TaskPanel::initWayland()
 {
     if (!QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) {
         return;
     }
     using namespace KWayland::Client;
     ConnectionThread *connection = ConnectionThread::fromApplication(this);
     if (!connection) {
         return;
     }
     Registry *registry = new Registry(this);
     registry->create(connection);
     connect(registry, &Registry::plasmaWindowManagementAnnounced, this,
         [this, registry] (quint32 name, quint32 version) {
             m_windowManagement = registry->createPlasmaWindowManagement(name, version, this);
             qRegisterMetaType<QVector<int> >("QVector<int>");
             connect(m_windowManagement, &PlasmaWindowManagement::showingDesktopChanged, this,
                 [this] (bool showing) {
                     if (showing == m_showingDesktop) {
                         return;
                     }
                     m_showingDesktop = showing;
                     emit showingDesktopChanged(m_showingDesktop);
                 }
             );
             //FIXME
             //connect(m_windowManagement, &PlasmaWindowManagement::activeWindowChanged, this, &TaskPanel::updateActiveWindow, Qt::QueuedConnection);
             
             connect(m_windowManagement, SIGNAL(activeWindowChanged()), m_activeTimer, SLOT(start()));
             updateActiveWindow();
         }
     );
     connect(registry, &Registry::plasmaShellAnnounced, this,
         [this, registry] (quint32 name, quint32 version) {
 
             m_shellInterface = registry->createPlasmaShell(name, version, this);
 
             if (!m_panel) {
                 return;
             }
             Surface *s = Surface::fromWindow(m_panel);
             if (!s) {
                 return;
             }
             m_shellSurface = m_shellInterface->createSurface(s, this);
             m_shellSurface->setSkipTaskbar(true);
         }
     );
     registry->setup();
     connection->roundtrip();
 }
 
 QWindow *TaskPanel::panel()
 {
     return m_panel;
 }
 
 void TaskPanel::setPanel(QWindow *panel)
 {
     using namespace KWayland::Client;
     if (panel == m_panel) {
         return;
     }
 
     m_panel = panel;
     emit panelChanged();
 
     Surface *s = Surface::fromWindow(panel);
     if (!s) {
         return;
     }
 
     m_shellSurface = m_shellInterface->createSurface(s, this);
     if (m_shellSurface) {
         m_shellSurface->setSkipTaskbar(true);
     }
 }
 
 void TaskPanel::updateActiveWindow()
 {
     if (!m_windowManagement || m_activeWindow == m_windowManagement->activeWindow()) {
         return;
     }
     if (m_activeWindow) {
         disconnect(m_activeWindow.data(), &KWayland::Client::PlasmaWindow::closeableChanged, this, &TaskPanel::hasCloseableActiveWindowChanged);
         disconnect(m_activeWindow.data(), &KWayland::Client::PlasmaWindow::unmapped,
             this, &TaskPanel::forgetActiveWindow);
     }
     m_activeWindow = m_windowManagement->activeWindow();
 
     if (m_activeWindow) {
         connect(m_activeWindow.data(), &KWayland::Client::PlasmaWindow::closeableChanged, this, &TaskPanel::hasCloseableActiveWindowChanged);
         connect(m_activeWindow.data(), &KWayland::Client::PlasmaWindow::unmapped,
                 this, &TaskPanel::forgetActiveWindow);
     }
 
     // TODO: connect to closeableChanged, not needed right now as KWin doesn't provide this changeable
     emit hasCloseableActiveWindowChanged();
 }
 
 bool TaskPanel::hasCloseableActiveWindow() const
 {
     return m_activeWindow && m_activeWindow->isCloseable() /*&& !m_activeWindow->isMinimized()*/;
 }
 
 void TaskPanel::forgetActiveWindow()
 {
     if (m_activeWindow) {
         disconnect(m_activeWindow.data(), &KWayland::Client::PlasmaWindow::closeableChanged, this, &TaskPanel::hasCloseableActiveWindowChanged);
         disconnect(m_activeWindow.data(), &KWayland::Client::PlasmaWindow::unmapped,
             this, &TaskPanel::forgetActiveWindow);
     }
     m_activeWindow.clear();
     emit hasCloseableActiveWindowChanged();  
 }
 
 void TaskPanel::closeActiveWindow()
 {
     if (m_activeWindow) {
         m_activeWindow->requestClose();
     }  
 }
 
 K_EXPORT_PLASMA_APPLET_WITH_JSON(taskpanel, TaskPanel, "metadata.json")
 
 #include "taskpanel.moc"