diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index 67a3111116..c54f552d52 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -2202,7 +2202,8 @@
 
 						var safeFocus = function() {
 							try {
-								toFocus.trigger('focus');
+                                // toFocus is not a JQuery object. Thus use focus.
+								toFocus.focus();
 							} catch (ignore) {
 								// WICKET-6209 IE fails if toFocus is disabled
 							}
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/trap-focus.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/trap-focus.js
index 8157833042..d8b49822ac 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/trap-focus.js
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/trap-focus.js
@@ -110,7 +110,8 @@
 			// ... restore old focus
 			if (oldActive) {
 				try {
-					oldActive.trigger('focus');
+                    // oldActive is not a JQuery element. Then use focus
+					oldActive.focus();
 					Wicket.Log.debug("trap-focus: restored focus to element ", oldActive);
 				} catch (error) {
 					Wicket.Log.error("trap-focus: error restoring focus. Attempted to set focus to element, but got an exception", oldActive, error);