diff --git a/scripting/workspace_wrapper.cpp b/scripting/workspace_wrapper.cpp
index cb52a828bd..0fda6ccfcd 100644
--- a/scripting/workspace_wrapper.cpp
+++ b/scripting/workspace_wrapper.cpp
@@ -57,7 +57,12 @@ WorkspaceWrapper::WorkspaceWrapper(QObject* parent) : QObject(parent)
 #endif
     connect(screens(), &Screens::sizeChanged, this, &WorkspaceWrapper::virtualScreenSizeChanged);
     connect(screens(), &Screens::geometryChanged, this, &WorkspaceWrapper::virtualScreenGeometryChanged);
-    connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), SIGNAL(numberScreensChanged(int)));
+    connect(screens(), &Screens::countChanged, this,
+        [this] (int previousCount, int currentCount) {
+            Q_UNUSED(previousCount)
+            emit numberScreensChanged(currentCount);
+        }
+    );
     connect(QApplication::desktop(), SIGNAL(resized(int)), SIGNAL(screenResized(int)));
     foreach (KWin::Client *client, ws->clientList()) {
         setupClientConnections(client);
diff --git a/tabbox/tabboxhandler.cpp b/tabbox/tabboxhandler.cpp
index da5a45602e..11f7c30703 100644
--- a/tabbox/tabboxhandler.cpp
+++ b/tabbox/tabboxhandler.cpp
@@ -31,9 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "scripting/scripting.h"
 #include "switcheritem.h"
 // Qt
-#include <QApplication>
 #include <QDebug>
-#include <QDesktopWidget>
 #include <QKeyEvent>
 #include <QModelIndex>
 #include <QStandardPaths>