diff --git a/form_builder.js b/form_builder.js
index 6be5ce6..8bda54e 100644
--- a/form_builder.js
+++ b/form_builder.js
@@ -415,7 +415,7 @@ Drupal.formBuilder.displayForm = function(response) {
     // Manually add a hidden element to pass additional data on submit.
     .prepend('<input type="hidden" name="return" value="field" />')
     // Add in any messages from the server.
-    .find('fieldset:visible:first').prepend(response.messages);
+    .find('fieldset:visible:first').find('.fieldset-wrapper:first').prepend(response.messages);
 
   $form.slideDown(function() {
     $preview.parents('div.form-builder-wrapper:first').find('a.progress').removeClass('progress');
@@ -502,7 +502,7 @@ Drupal.formBuilder.updateElement = function(response) {
   // Display messages, if any.
   $configureForm.find('.messages').remove();
   if (response.messages) {
-    $configureForm.find('fieldset:visible:first').prepend(response.messages);
+    $configureForm.find('fieldset:visible:first').find('.fieldset-wrapper:first').prepend(response.messages);
   }
 
   // Do not update the element if errors were received.