diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt b/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt
index 5b87237eb5a4..564ca3137684 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt
@@ -21,7 +21,6 @@ import com.intellij.ide.plugins.cl.PluginAwareClassLoader
 import com.intellij.ide.plugins.cl.PluginClassLoader
 import com.intellij.ide.ui.TopHitCache
 import com.intellij.ide.ui.UIThemeProvider
-import com.intellij.ide.util.TipAndTrickManager
 import com.intellij.idea.IdeaLogger
 import com.intellij.lang.Language
 import com.intellij.notification.NotificationType
@@ -514,8 +513,6 @@ object DynamicPlugins {
     }
 
     try {
-      TipAndTrickManager.getInstance().closeTipDialog()
-
       app.messageBus.syncPublisher(DynamicPluginListener.TOPIC).beforePluginUnload(pluginDescriptor, options.isUpdate)
       IdeEventQueue.getInstance().flushQueue()
     }
diff --git a/platform/tips-of-the-day/resources/intellij.platform.tips.xml b/platform/tips-of-the-day/resources/intellij.platform.tips.xml
index 974070330dca..c3d8cdc8cd70 100644
--- a/platform/tips-of-the-day/resources/intellij.platform.tips.xml
+++ b/platform/tips-of-the-day/resources/intellij.platform.tips.xml
@@ -28,6 +28,10 @@
                  restartRequired="false"/>
   </extensions>
 
+  <applicationListeners>
+    <listener class="com.intellij.platform.tips.CloseTipDialogOnPluginUnloadingListener" topic="com.intellij.ide.plugins.DynamicPluginListener"/>
+  </applicationListeners>
+  
   <projectListeners>
     <listener class="com.intellij.ide.util.TipsUsageManager$TipsUsageListener"
               activeInTestMode="false"
diff --git a/platform/tips-of-the-day/src/com/intellij/platform/tips/CloseTipDialogOnPluginUnloadingListener.kt b/platform/tips-of-the-day/src/com/intellij/platform/tips/CloseTipDialogOnPluginUnloadingListener.kt
new file mode 100644
index 000000000000..ef2ebe69b465
--- /dev/null
+++ b/platform/tips-of-the-day/src/com/intellij/platform/tips/CloseTipDialogOnPluginUnloadingListener.kt
@@ -0,0 +1,12 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.platform.tips
+
+import com.intellij.ide.plugins.DynamicPluginListener
+import com.intellij.ide.plugins.IdeaPluginDescriptor
+import com.intellij.ide.util.TipAndTrickManager
+
+internal class CloseTipDialogOnPluginUnloadingListener : DynamicPluginListener {
+  override fun beforePluginUnload(pluginDescriptor: IdeaPluginDescriptor, isUpdate: Boolean) {
+    TipAndTrickManager.getInstance().closeTipDialog()
+  }
+}