diff --git a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee
index 15d66648e..35397afa9 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee
@@ -35,7 +35,11 @@ class App.ControllerForm extends App.Controller
   formGen: ->
     App.Log.debug 'ControllerForm', 'formGen', @model.configure_attributes
 
-    fieldset = $('<fieldset></fieldset>')
+    # check if own fieldset should be generated
+    if @noFieldset
+      fieldset = @el
+    else
+      fieldset = $('<fieldset></fieldset>')
 
     # collect form attributes
     @attributes = []
@@ -81,9 +85,6 @@ class App.ControllerForm extends App.Controller
           item = @formGenItem( attribute, className, fieldset, attribute_count )
           item.appendTo(fieldset)
 
-    if @noFieldset
-      fieldset = fieldset.children()
-
     if @fullForm
       if !@formClass
         @formClass = ''