diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
index e6f5810c9d..b2093e1e4e 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
@@ -135,7 +135,7 @@
             _dataTable.ajax.reload();
         });
 
-        _$wrapper.find('button[name=CreateRole]').click(function (e) {
+        $('#AbpContentToolbar button[name=CreateRole]').click(function (e) {
             e.preventDefault();
             _createModal.open();
         });
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js
index fcd3a72f52..26b2e1ce36 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js
@@ -170,7 +170,7 @@
             _dataTable.ajax.reload();
         });
 
-        _$wrapper.find('button[name=CreateUser]').click(function (e) {
+        $('#AbpContentToolbar button[name=CreateUser]').click(function (e) {
             e.preventDefault();
             _createModal.open();
         });
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js
index a9cf094c6c..d1cbbf6bdc 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js
@@ -109,7 +109,7 @@
             _dataTable.ajax.reload();
         });
 
-        _$wrapper.find('button[name=CreateTenant]').click(function (e) {
+        $('#AbpContentToolbar button[name=CreateTenant]').click(function (e) {
             e.preventDefault();
             _createModal.open();
         });