diff --git a/options_element.inc b/options_element.inc
index ed64743..fa8ef0f 100644
--- a/options_element.inc
+++ b/options_element.inc
@@ -54,7 +54,7 @@ function theme_options($variables) {
 
   $output = '';
   $output .= '<div class="' . implode(' ', $classes) .'">';
-  $output .= theme('fieldset', array('element' => array(
+  $output .= theme('container', array('element' => array(
     '#title' => t('Options'),
     '#collapsible' => FALSE,
     '#children' => $options,
diff --git a/options_element.js b/options_element.js
index 11ccb6a..a2ccb63 100644
--- a/options_element.js
+++ b/options_element.js
@@ -25,7 +25,7 @@ Drupal.optionsElement = function(element) {
 
   // Find the original "manual" fields.
   this.element = element;
-  this.manualElement = $(element).find('fieldset.options, div.fieldset.options').get(0);
+  this.manualElement = $(element).find('fieldset.options, div.options').get(0);
   this.manualOptionsElement = $(element).find('textarea').get(0);
   this.manualDefaultValueElement = $(element).find('input.form-text').get(0);
   this.keyTypeToggle = $(element).find('input.key-type-toggle').get(0);