diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemtray.cpp
--- a/applets/systemtray/systemtray.cpp
+++ b/applets/systemtray/systemtray.cpp
@@ -213,6 +213,8 @@
     }
 
     KAcceleratorManager::manage(desktopMenu);
+    desktopMenu->winId();
+    desktopMenu->windowHandle()->setTransientParent(appletInterface->window());
     desktopMenu->popup(pos.toPoint());
 }
 
diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
--- a/startkde/startplasma.cmake
+++ b/startkde/startplasma.cmake
@@ -26,11 +26,9 @@
 
 [ -r $configDir/startupconfig ] && . $configDir/startupconfig
 
-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
-    xrdb -quiet -merge -nocpp <<EOF
-Xft.dpi: $kcmfonts_general_forcefontdpi
+xrdb -quiet -merge -nocpp <<EOF
+Xft.dpi: $QT_WAYLAND_FORCE_DPI
 EOF
-fi
 
 dl=$DESKTOP_LOCKED
 unset DESKTOP_LOCKED # Don't want it in the environment