diff --git a/src/shell/shellcorona.cpp b/src/shell/shellcorona.cpp
index 21eec90cd..5184d4e15 100644
--- a/src/shell/shellcorona.cpp
+++ b/src/shell/shellcorona.cpp
@@ -326,7 +326,10 @@ QRegion ShellCorona::availableScreenRegion(int id) const
 
 QRect ShellCorona::availableScreenRect(int id) const
 {
-    return QApplication::desktop()->availableGeometry(id);
+    //return QApplication::desktop()->availableGeometry(id);
+    //FIXME: revert back to this^ after https://codereview.qt-project.org/#change,80606 has been merged
+    //       and released (and we depend on it)
+    return KWindowSystem::workArea(id).intersect(QApplication::desktop()->availableGeometry(id));
 }
 
 PanelView *ShellCorona::panelView(Plasma::Containment *containment) const