diff --git a/autotests/integration/CMakeLists.txt b/autotests/integration/CMakeLists.txt
index d8fe8ae600..1cdc83c5fb 100644
--- a/autotests/integration/CMakeLists.txt
+++ b/autotests/integration/CMakeLists.txt
@@ -53,6 +53,7 @@ integrationTest(WAYLAND_ONLY NAME testKeymapCreationFailure SRCS keymap_creation
 integrationTest(WAYLAND_ONLY NAME testShowingDesktop SRCS showing_desktop_test.cpp)
 integrationTest(NAME testDontCrashUseractionsMenu SRCS dont_crash_useractions_menu.cpp)
 integrationTest(WAYLAND_ONLY NAME testKWinBindings SRCS kwinbindings_test.cpp)
+integrationTest(WAYLAND_ONLY NAME testVirtualDesktop SRCS virtual_desktop_test.cpp)
 
 if (XCB_ICCCM_FOUND)
     integrationTest(NAME testMoveResize SRCS move_resize_window_test.cpp LIBS XCB::ICCCM)
diff --git a/autotests/integration/virtual_desktop_test.cpp b/autotests/integration/virtual_desktop_test.cpp
new file mode 100644
index 0000000000..82a7c405de
--- /dev/null
+++ b/autotests/integration/virtual_desktop_test.cpp
@@ -0,0 +1,117 @@
+/********************************************************************
+KWin - the KDE window manager
+This file is part of the KDE project.
+
+Copyright (C) 2017 Martin Flöser <mgraesslin@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, see <http://www.gnu.org/licenses/>.
+*********************************************************************/
+#include "kwin_wayland_test.h"
+#include "main.h"
+#include "platform.h"
+#include "screens.h"
+#include "shell_client.h"
+#include "wayland_server.h"
+#include "virtualdesktops.h"
+
+#include <KWayland/Client/surface.h>
+
+using namespace KWin;
+using namespace KWayland::Client;
+
+static const QString s_socketName = QStringLiteral("wayland_test_kwin_virtualdesktop-0");
+
+class VirtualDesktopTest : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void initTestCase();
+    void init();
+    void cleanup();
+
+    void testLastDesktopRemoved_data();
+    void testLastDesktopRemoved();
+};
+
+void VirtualDesktopTest::initTestCase()
+{
+    qRegisterMetaType<KWin::ShellClient*>();
+    qRegisterMetaType<KWin::AbstractClient*>();
+    QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
+    QVERIFY(workspaceCreatedSpy.isValid());
+    kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
+    QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit()));
+
+    kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig));
+    qputenv("KWIN_XKB_DEFAULT_KEYMAP", "1");
+    qputenv("XKB_DEFAULT_RULES", "evdev");
+
+    kwinApp()->start();
+    QVERIFY(workspaceCreatedSpy.wait());
+    waylandServer()->initWorkspace();
+}
+
+void VirtualDesktopTest::init()
+{
+    QVERIFY(Test::setupWaylandConnection());
+    screens()->setCurrent(0);
+    VirtualDesktopManager::self()->setCount(1);
+}
+
+void VirtualDesktopTest::cleanup()
+{
+    Test::destroyWaylandConnection();
+}
+
+void VirtualDesktopTest::testLastDesktopRemoved_data()
+{
+    QTest::addColumn<Test::ShellSurfaceType>("type");
+
+    QTest::newRow("wlShell") << Test::ShellSurfaceType::WlShell;
+    QTest::newRow("xdgShellV5") << Test::ShellSurfaceType::XdgShellV5;
+    QTest::newRow("xdgShellV6") << Test::ShellSurfaceType::XdgShellV6;
+}
+
+void VirtualDesktopTest::testLastDesktopRemoved()
+{
+    // first create a new desktop
+    QCOMPARE(VirtualDesktopManager::self()->count(), 1u);
+    VirtualDesktopManager::self()->setCount(2);
+    QCOMPARE(VirtualDesktopManager::self()->count(), 2u);
+
+    // switch to last desktop
+    VirtualDesktopManager::self()->setCurrent(VirtualDesktopManager::self()->desktops().last());
+    QCOMPARE(VirtualDesktopManager::self()->current(), 2u);
+
+    // now create a window on this desktop
+    QScopedPointer<Surface> surface(Test::createSurface());
+    QFETCH(Test::ShellSurfaceType, type);
+    QScopedPointer<QObject> shellSurface(Test::createShellSurface(type, surface.data()));
+    auto client = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
+
+    QVERIFY(client);
+    QCOMPARE(client->desktop(), 2);
+    QSignalSpy desktopPresenceChangedSpy(client, &ShellClient::desktopPresenceChanged);
+    QVERIFY(desktopPresenceChangedSpy.isValid());
+
+    // and remove last desktop
+    VirtualDesktopManager::self()->setCount(1);
+    QCOMPARE(VirtualDesktopManager::self()->count(), 1u);
+    // now the client should be moved as well
+    QTRY_COMPARE(desktopPresenceChangedSpy.count(), 1);
+    QCOMPARE(client->desktop(), 1);
+}
+
+WAYLANDTEST_MAIN(VirtualDesktopTest)
+#include "virtual_desktop_test.moc"
diff --git a/workspace.cpp b/workspace.cpp
index 5818d6b86f..79c0638e2c 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1069,7 +1069,7 @@ void Workspace::updateCurrentActivity(const QString &new_activity)
 
 void Workspace::moveClientsFromRemovedDesktops()
 {
-    for (ClientList::ConstIterator it = clients.constBegin(); it != clients.constEnd(); ++it) {
+    for (auto it = m_allClients.constBegin(); it != m_allClients.constEnd(); ++it) {
         if (!(*it)->isOnAllDesktops() && (*it)->desktop() > static_cast<int>(VirtualDesktopManager::self()->count()))
             sendClientToDesktop(*it, VirtualDesktopManager::self()->count(), true);
     }