diff --git a/extensions/libs/webroot/js/infinitas.js b/extensions/libs/webroot/js/infinitas.js
index 3156fc119..b60212f4b 100644
--- a/extensions/libs/webroot/js/infinitas.js
+++ b/extensions/libs/webroot/js/infinitas.js
@@ -23,15 +23,6 @@ if(typeof Infinitas.params.prefix == 'undefined'){
 	Infinitas.params.prefix = 'frontend';
 }
 
-/**
- *
- * @access public
- * @return void
- **/
-function focus(){
-	$(':input:visible:first').focus();
-}
-
 switch(Infinitas.params.prefix) {
 	case 'admin':
 		require([
@@ -50,7 +41,7 @@ switch(Infinitas.params.prefix) {
 		function(require) {
 			$(document).ready(function(){
 				$('.tabs').tabs();
-				focus();
+				$.FormHelper.foucusOnFirst();
 				setupAjaxDropdowns();
 				setupRowSelecting();
 				setupDatePicker();
@@ -89,7 +80,6 @@ switch(Infinitas.params.prefix) {
 		function(require) {
 			$(document).ready(function(){
 				$('.tabs').tabs();
-				focus();
 				$("#side_bar").show().jixedbar();
 				//setupStarRating();
 
diff --git a/extensions/libs/webroot/js/libs/form.js b/extensions/libs/webroot/js/libs/form.js
index 7ff12c9a1..e09174f4a 100644
--- a/extensions/libs/webroot/js/libs/form.js
+++ b/extensions/libs/webroot/js/libs/form.js
@@ -1,6 +1,17 @@
 (function($) {
 	var FormHelper = $.FormHelper = {};
 
+	/**
+	 * Focus on the first available text field, used in admin to make the
+	 * overall usability a bit better.
+	 *
+	 * @access public
+	 * @return void
+	 **/
+	FormHelper.foucusOnFirst = function(){
+		$("input:text:visible:first").focus();
+	}
+
 	/**
 	 * generate a form input
 	 */