diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs
index 6e11a5ac57..d9895526de 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs
@@ -44,7 +44,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared
                     "/libs/abp/jquery/abp.ajax.js",
                     "/libs/abp/jquery/abp.resource-loader.js",
                     "/libs/abp/aspnetcore.mvc.ui.theme.shared/jquery/jquery-extensions.js",
-                    "/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/abp.modal-manager.js",
+                    "/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/dom-event-handlers.js",
+                    "/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/modal-manager.js",
                     "/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables-extensions.js"
                 });
             });
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/dom-event-handlers.js b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/dom-event-handlers.js
new file mode 100644
index 0000000000..65f58f2e84
--- /dev/null
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/dom-event-handlers.js
@@ -0,0 +1,29 @@
+(function() {
+    
+    abp.dom.onNodeAdded(function (args) {
+        args.$el.findWithSelf('[data-toggle="tooltip"]').tooltip({
+            container: 'body'
+        });
+
+        args.$el.findWithSelf('[data-toggle="popover"]').popover({
+            container: 'body'
+        });
+    });
+
+    abp.dom.onNodeRemoved(function (args) {
+        args.$el.findWithSelf('[data-toggle="tooltip"]').each(function () {
+            $('#' + $(this).attr('aria-describedby')).remove();
+        });
+    });
+
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip({
+            container: 'body'
+        });
+
+        $('[data-toggle="popover"]').popover({
+            container: 'body'
+        });
+    });
+
+})();
\ No newline at end of file
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/abp.modal-manager.js b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/modal-manager.js
similarity index 100%
rename from src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/abp.modal-manager.js
rename to src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/modal-manager.js