diff --git a/main_wayland.cpp b/main_wayland.cpp
index 40336ae74..30faf5c00 100644
--- a/main_wayland.cpp
+++ b/main_wayland.cpp
@@ -159,7 +159,6 @@ void ApplicationWayland::performStartup()
// now libinput thread has been created, adjust scheduler to not leak into other processes
gainRealTime(RealTimeFlags::ResetOnFork);
- VirtualKeyboard::create(this);
createBackend();
TabletModeManager::create(this);
}
@@ -192,6 +191,7 @@ void ApplicationWayland::finalizeStartup()
startSession();
createWorkspace();
notifyKSplash();
+ VirtualKeyboard::create(this);
}
void ApplicationWayland::continueStartupWithScene()
diff --git a/shadow.cpp b/shadow.cpp
index 2cbabb01b..4175976a1 100644
--- a/shadow.cpp
+++ b/shadow.cpp
@@ -356,13 +356,14 @@ bool Shadow::updateShadow()
}
}
- auto data = Shadow::readX11ShadowProperty(m_topLevel->window());
- if (data.isEmpty()) {
- return false;
+ if (kwinApp()->operationMode() != Application::OperationModeWaylandOnly) {
+ auto data = Shadow::readX11ShadowProperty(m_topLevel->window());
+ if (data.isEmpty()) {
+ return false;
+ }
+ init(data);
}
- init(data);
-
return true;
}