2 files changed, 9 insertions, 12 deletions
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index caf6c44f1778..6a3ea2edfda1 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -39,9 +39,6 @@
 #include <rtl/character.hxx>
 #include <tools/debug.hxx>
 
-#include <sfx2/lokhelper.hxx>
-#include <comphelper/lok.hxx>
-
 namespace sd {
 
 /**
@@ -150,15 +147,6 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, sal_uInt16 nAspect,
 void DrawDocShell::Connect(ViewShell* pViewSh)
 {
     mpViewShell = pViewSh;
-
-    if (comphelper::LibreOfficeKit::isActive())
-    {
-        SfxViewShell* sfxViewShell = mpViewShell->GetViewShell();
-        if (sfxViewShell)
-        {
-            mpViewShell->GetViewShell()->libreOfficeKitViewInvalidateTilesCallback(nullptr, sfxViewShell->getPart(), sfxViewShell->getEditMode());
-        }
-    }
 }
 
 void DrawDocShell::Disconnect(ViewShell const * pViewSh)
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index d2cb6ebfee21..3aad7a10a2a3 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -24,6 +24,8 @@
 #include <ViewShellBase.hxx>
 #include <ViewShellManager.hxx>
 #include <Window.hxx>
+#include <comphelper/lok.hxx>
+#include <sfx2/lokhelper.hxx>
 #include <vcl/vclevent.hxx>
 #include <svx/fmshell.hxx>
 #include <osl/diagnose.h>
@@ -156,6 +158,13 @@ void FormShellManager::RegisterAtCenterPane()
     mpSubShellFactory = std::make_shared<FormShellManagerFactory>(*pShell, *this);
     mrBase.GetViewShellManager()->AddSubShellFactory(pShell,mpSubShellFactory);
     mrBase.GetViewShellManager()->ActivateSubShell(*pShell, ToolbarId::FormLayer_Toolbox);
+
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        SfxViewShell* sfxViewShell = pShell->GetViewShell();
+        if (sfxViewShell)
+            pShell->GetViewShell()->libreOfficeKitViewInvalidateTilesCallback(nullptr, sfxViewShell->getPart(), sfxViewShell->getEditMode());
+    }
 }
 
 void FormShellManager::UnregisterAtCenterPane()