diff --git a/bundles/AdminBundle/Controller/Searchadmin/SearchController.php b/bundles/AdminBundle/Controller/Searchadmin/SearchController.php
index 5d7c7da863c..7988bcf9ae9 100644
--- a/bundles/AdminBundle/Controller/Searchadmin/SearchController.php
+++ b/bundles/AdminBundle/Controller/Searchadmin/SearchController.php
@@ -50,11 +50,8 @@ class SearchController extends AdminController
      * @return JsonResponse
      *
      * @todo: $conditionTypeParts could be undefined
-     *
      * @todo: $conditionSubtypeParts could be undefined
-     *
      * @todo: $conditionClassnameParts could be undefined
-     *
      * @todo: $data could be undefined
      */
     public function findAction(Request $request, EventDispatcherInterface $eventDispatcher, GridHelperService $gridHelperService)
diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/object/helpers/edit.js b/bundles/AdminBundle/Resources/public/js/pimcore/object/helpers/edit.js
index 01bee53fd8e..60d1ccaf632 100644
--- a/bundles/AdminBundle/Resources/public/js/pimcore/object/helpers/edit.js
+++ b/bundles/AdminBundle/Resources/public/js/pimcore/object/helpers/edit.js
@@ -403,7 +403,10 @@ pimcore.object.helpers.edit = {
                             try {
                                 var el = this.getEl();
                                 if(!el.hasCls("object_field")) {
-                                    el = el.parent(".object_field");
+                                    var parentEl = el.parent(".object_field");
+                                    if(parentEl !== null && parentEl !== undefined){
+                                        el = parentEl;
+                                    }
                                 }
                             } catch (e4) {
                                 console.log(e4);