diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2ScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2ScriptContributor.cs
index 1e5f138f97..81696d5e71 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2ScriptContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2ScriptContributor.cs
@@ -12,6 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Select2
         {
             //TODO: Add select2.full.min.js or localize!
             context.Files.AddIfNotContains("/libs/select2/js/select2.min.js");
+            context.Files.AddIfNotContains("/libs/select2/js/select2-bootstrap-modal-patch.js");
         }
     }
 }
diff --git a/npm/packs/select2/abp.resourcemapping.js b/npm/packs/select2/abp.resourcemapping.js
index a264a19367..f1205487b7 100644
--- a/npm/packs/select2/abp.resourcemapping.js
+++ b/npm/packs/select2/abp.resourcemapping.js
@@ -3,6 +3,7 @@
         "@node_modules/select2/dist/css/select2.min.css": "@libs/select2/css/",
         "@node_modules/select2/dist/js/select2.min.js": "@libs/select2/js/",
         "@node_modules/select2/dist/js/select2.full.min.js": "@libs/select2/js/",
-        "@node_modules/select2/dist/js/i18n/*.js": "@libs/select2/js/i18n/"
+        "@node_modules/select2/dist/js/i18n/*.js": "@libs/select2/js/i18n/",
+        "@node_modules/@abp/select2/src/*.*": "@libs/select2/js/"
     }
 }
\ No newline at end of file
diff --git a/npm/packs/select2/src/select2-bootstrap-modal-patch.js b/npm/packs/select2/src/select2-bootstrap-modal-patch.js
new file mode 100644
index 0000000000..1fee6e798d
--- /dev/null
+++ b/npm/packs/select2/src/select2-bootstrap-modal-patch.js
@@ -0,0 +1,4 @@
+/*
+    https://select2.org/troubleshooting/common-problems
+*/
+$.fn.modal.Constructor.prototype._enforceFocus = function () { };
\ No newline at end of file