1 files changed, 13 insertions, 6 deletions
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 3a4b64335139..17f64d51a063 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -21,12 +21,9 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <algorithm>
-#include <vcl/builder.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/IDialogRenderable.hxx>
-#include <unotools/viewoptions.hxx>
 
 #include <appdata.hxx>
+#include <comphelper/lok.hxx>
 #include <sfxtypes.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -38,8 +35,11 @@
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/itemconnect.hxx>
 #include <sfx2/viewsh.hxx>
-
 #include <uitest/sfx_uiobject.hxx>
+#include <unotools/viewoptions.hxx>
+#include <vcl/builder.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/IDialogRenderable.hxx>
 
 #include <sfx2/strings.hrc>
 #include <helpids.h>
@@ -403,6 +403,13 @@ void SfxTabDialog::dispose()
     m_pBaseFmtBtn.clear();
     m_pActionArea.clear();
 
+    SfxViewShell* pViewShell = SfxViewShell::Current();
+    if (comphelper::LibreOfficeKit::isActive() && pViewShell)
+    {
+        pViewShell->notifyDialog(maID, "close");
+        pViewShell->UnregisterDlg(maID);
+    }
+
     TabDialog::dispose();
 }
 
@@ -512,7 +519,7 @@ short SfxTabDialog::Execute()
     Start_Impl();
 
     SfxViewShell* pViewShell = SfxViewShell::Current();
-    if (pViewShell)
+    if (comphelper::LibreOfficeKit::isActive() && pViewShell)
     {
         pViewShell->RegisterDlg(maID, this);
         registerDialogNotifier(static_cast<vcl::IDialogNotifier*>(pViewShell));