diff --git a/js/apps/system/aardvark/frontend/js/views/modalView.js b/js/apps/system/aardvark/frontend/js/views/modalView.js
index d0597e0254..3d86e17a6f 100644
--- a/js/apps/system/aardvark/frontend/js/views/modalView.js
+++ b/js/apps/system/aardvark/frontend/js/views/modalView.js
@@ -336,9 +336,12 @@
       var focus = $('#modal-dialog').find('input');
       if (focus) {
         setTimeout(function() {
-          var focus = $('#modal-dialog').find('input');
-          if (focus) {
-            $(focus[0]).focus();
+          var focus = $('#modal-dialog');
+          if (focus.length > 0) {
+            focus = focus.find('input'); 
+              if (focus.length > 0) {
+                $(focus[0]).focus();
+              }
           }
         }, 800);
       }