diff --git a/app/helpers/cms/form_tag_helper.rb b/app/helpers/cms/form_tag_helper.rb
index b1e8334e8..a4f79419c 100644
--- a/app/helpers/cms/form_tag_helper.rb
+++ b/app/helpers/cms/form_tag_helper.rb
@@ -8,7 +8,7 @@ module FormTagHelper
     # support.
     def content_block_form_for(object, *args, &block)
       options = args.extract_options!
-      simple_form_for(engine_aware_path(object), *(args << options.merge(builder: Cms::FormBuilder::ContentBlockFormBuilder)), &block)
+      simple_form_for(engine_aware_path(object), *(args << options.merge(builder: Cms::FormBuilder::ContentBlockFormBuilder, wrapper: 'browsercms')), &block)
     end
 
 
diff --git a/lib/cms/configure_simple_form_bootstrap.rb b/lib/cms/configure_simple_form_bootstrap.rb
index b8ac850d3..ddce27ba6 100644
--- a/lib/cms/configure_simple_form_bootstrap.rb
+++ b/lib/cms/configure_simple_form_bootstrap.rb
@@ -9,6 +9,15 @@
     b.use :hint, wrap_with: {tag: 'p', class: 'help-block'}
   end
 
+  config.wrappers :browsercms, tag: 'div', class: 'control-group row-fluid', error_class: 'error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.use :input
+    b.use :error, wrap_with: {tag: 'span', class: 'help-inline'}
+    b.use :hint, wrap_with: {tag: 'p', class: 'help-block'}
+  end
+
   config.wrappers :checkbox, :tag => 'div', :class => 'control-group row-fluid', :error_class => 'error' do |b|
     b.use :html5
     b.use :placeholder