diff --git a/src/platformtheme/kwaylandintegration.h b/src/platformtheme/kwaylandintegration.h
--- a/src/platformtheme/kwaylandintegration.h
+++ b/src/platformtheme/kwaylandintegration.h
@@ -45,6 +45,9 @@
     bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
 
 private:
+    void shellSurfaceCreated(QWindow *w);
+    void shellSurfaceDestroyed(QWindow *w);
+
     void installColorScheme(QWindow *w);
     KWayland::Client::ServerSideDecorationManager *m_decoration;
 };
diff --git a/src/platformtheme/kwaylandintegration.cpp b/src/platformtheme/kwaylandintegration.cpp
--- a/src/platformtheme/kwaylandintegration.cpp
+++ b/src/platformtheme/kwaylandintegration.cpp
@@ -71,65 +71,71 @@
 {
     if (!m_decoration) {
         return false;
-    }
-    if (event->type() == QEvent::PlatformSurface) {
+    } else if (event->type() == QEvent::Expose) {
+        auto ee = static_cast<QExposeEvent*>(event);
+        if (ee->region().isNull()) {
+            return false;
+        }
         QWindow *w = qobject_cast<QWindow*>(watched);
         if (!w || w->parent()) {
             return false;
         }
-        if (auto e = dynamic_cast<QPlatformSurfaceEvent*>(event)) {
-            switch (e->surfaceEventType()) {
-            case QPlatformSurfaceEvent::SurfaceCreated: {
-                // set colorscheme hint
-                if (qApp->property(s_schemePropertyName.constData()).isValid()) {
-                    installColorScheme(w);
-                }
-                const auto blurBehindProperty = w->property(s_blurBehindPropertyName.constData());
-                if (blurBehindProperty.isValid()) {
-                    KWindowEffects::enableBlurBehind(w->winId(), blurBehindProperty.toBool());
-                }
-                // create deco
-                Surface *s = Surface::fromWindow(w);
-                if (!s) {
-                    return false;
-                }
-                auto deco = m_decoration->create(s, w);
-                connect(deco, &ServerSideDecoration::modeChanged, w,
-                    [deco, w] {
-                        const auto flags = w->flags();
-                        const auto ourMode = (flags.testFlag(Qt::FramelessWindowHint) || flags.testFlag(Qt::Popup) || flags.testFlag(Qt::ToolTip)) ? ServerSideDecoration::Mode::None : ServerSideDecoration::Mode::Server;
-                        if (deco->mode() != ourMode) {
-                            deco->requestMode(ourMode);
-                        }
-                    }
-                );
-                const auto flags = w->flags();
-                const auto ourMode = (flags.testFlag(Qt::FramelessWindowHint) || flags.testFlag(Qt::Popup) || flags.testFlag(Qt::ToolTip)) ? ServerSideDecoration::Mode::None : ServerSideDecoration::Mode::Server;
-                if (deco->defaultMode() != ourMode) {
-                    deco->requestMode(ourMode);
-                }
-                w->setProperty("org.kde.plasma.integration.waylandserverdecoration", QVariant::fromValue(deco));
-                break;
-            }
-            case QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed: {
-                delete w->property("org.kde.plasma.integration.waylandserverdecoration").value<ServerSideDecoration*>();
-                break;
-            }
-            default:
-                // nothing
-                break;
-            }
+        shellSurfaceCreated(w);
+    } else if (event->type() == QEvent::Hide) {
+        QWindow *w = qobject_cast<QWindow*>(watched);
+        if (!w || w->parent()) {
+            return false;
         }
-    }
-    if (event->type() == QEvent::ApplicationPaletteChange) {
+        shellSurfaceDestroyed(w);
+    } else if (event->type() == QEvent::ApplicationPaletteChange) {
         const auto topLevelWindows = QGuiApplication::topLevelWindows();
         for (QWindow *w : topLevelWindows) {
             installColorScheme(w);
         }
     }
+
     return false;
 }
 
+void KWaylandIntegration::shellSurfaceCreated(QWindow *w)
+{
+    // set colorscheme hint
+    if (qApp->property(s_schemePropertyName.constData()).isValid()) {
+        installColorScheme(w);
+    }
+    const auto blurBehindProperty = w->property(s_blurBehindPropertyName.constData());
+    if (blurBehindProperty.isValid()) {
+        KWindowEffects::enableBlurBehind(w->winId(), blurBehindProperty.toBool());
+    }
+    // create deco
+    Surface *s = Surface::fromWindow(w);
+    if (!s) {
+        return;
+    }
+    auto deco = m_decoration->create(s, w);
+    connect(deco, &ServerSideDecoration::modeChanged, w,
+        [deco, w] {
+            const auto flags = w->flags();
+            const auto ourMode = (flags.testFlag(Qt::FramelessWindowHint) || flags.testFlag(Qt::Popup) || flags.testFlag(Qt::ToolTip)) ? ServerSideDecoration::Mode::None : ServerSideDecoration::Mode::Server;
+            if (deco->mode() != ourMode) {
+                deco->requestMode(ourMode);
+            }
+        }
+    );
+    const auto flags = w->flags();
+    const auto ourMode = (flags.testFlag(Qt::FramelessWindowHint) || flags.testFlag(Qt::Popup) || flags.testFlag(Qt::ToolTip)) ? ServerSideDecoration::Mode::None : ServerSideDecoration::Mode::Server;
+    if (deco->defaultMode() != ourMode) {
+        deco->requestMode(ourMode);
+    }
+    w->setProperty("org.kde.plasma.integration.waylandserverdecoration", QVariant::fromValue(deco));
+}
+
+void KWaylandIntegration::shellSurfaceDestroyed(QWindow *w)
+{
+    delete w->property("org.kde.plasma.integration.waylandserverdecoration").value<ServerSideDecoration*>();
+    w->setProperty("org.kde.plasma.integration.waylandserverdecoration", 0);
+}
+
 void KWaylandIntegration::installColorScheme(QWindow *w)
 {
     if (QPlatformNativeInterface *native = qApp->platformNativeInterface()) {
@@ -147,3 +153,5 @@
         }
     }
 }
+
+#include "kwaylandintegration.moc"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,2 +1,5 @@
 add_executable(qfiledialogtest qfiledialogtest.cpp)
 target_link_libraries(qfiledialogtest Qt5::Core Qt5::Widgets)
+
+add_executable(windowdecotest windowdecotest.cpp)
+target_link_libraries(windowdecotest Qt5::Core Qt5::Widgets)
diff --git a/tests/windowdecotest.cpp b/tests/windowdecotest.cpp
new file mode 100644
--- /dev/null
+++ b/tests/windowdecotest.cpp
@@ -0,0 +1,71 @@
+/* This file is part of the KDE libraries
+
+    Copyright 2017 David Edmundson <davidedmundson@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+ * This class is for checking that wayland server side window decorations remain
+ * after a window is hidden and shown.
+ */
+
+#include <QApplication>
+#include <QWidget>
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QTimer>
+
+class ATestWindow: public QWidget
+{
+    Q_OBJECT
+public:
+    ATestWindow();
+
+private:
+    QPushButton *mBtn;
+    QWidget *m_area;
+};
+
+ATestWindow::ATestWindow()
+{
+    mBtn = new QPushButton(QStringLiteral("Hide and Show"));
+
+    m_area = new QWidget;
+    m_area->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+    connect(mBtn, &QPushButton::clicked, this, [this]() {
+        this->hide();
+        QTimer::singleShot(1000, this, [this](){this->show();});
+    });
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(mBtn);
+    setLayout(layout);
+}
+
+
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    ATestWindow wnd;
+    wnd.show();
+
+    return app.exec();
+}
+
+
+#include "windowdecotest.moc"