diff --git a/datamodels/2.x/itop-portal-base/portal/public/js/bootstrap-patches.js b/datamodels/2.x/itop-portal-base/portal/public/js/bootstrap-patches.js
index f4ae87988..b0319a110 100644
--- a/datamodels/2.x/itop-portal-base/portal/public/js/bootstrap-patches.js
+++ b/datamodels/2.x/itop-portal-base/portal/public/js/bootstrap-patches.js
@@ -31,7 +31,7 @@ $.fn.modal.Constructor.prototype.enforceFocus = function () {
 		var $parent = $(e.target.parentNode);
 		if ($modalElement[0] !== e.target && !$modalElement.has(e.target).length &&
 			!$parent.hasClass('ck-input')) {
-			e.target.focus()
+			$(e.target.activeElement).focus();
 		}
 	})
 };