diff --git a/includes/content.inc b/includes/content.inc
index 6f9f49e..5d9bfa0 100644
--- a/includes/content.inc
+++ b/includes/content.inc
@@ -485,6 +485,7 @@ function ctools_content_configure_form_defaults($form, &$form_state) {
   }
 
   ctools_include('dependent');
+  form_load_include($form_state, 'inc', 'ctools', 'includes/content');
 
   // Unless we're not allowed to override the title on this content type, add this
   // gadget to all panes.
diff --git a/plugins/content_types/entity_context/entity_field.inc b/plugins/content_types/entity_context/entity_field.inc
index 982fa61..728cd3b 100644
--- a/plugins/content_types/entity_context/entity_field.inc
+++ b/plugins/content_types/entity_context/entity_field.inc
@@ -209,7 +209,10 @@ function ctools_entity_field_content_type_formatter_options($form, &$form_state)
       'wrapper' => 'ctools-content-entity-field-formatter-settings',
       'callback' => 'ctools_entity_field_content_type_formatter_change',
     ),
-    '#submit' => array('ctools_entity_field_content_type_formatter_options_submit_temporary'),
+    '#submit' => array(
+      'ctools_content_configure_form_defaults_submit',
+      'ctools_entity_field_content_type_formatter_options_submit_temporary'
+    ),
     '#executes_submit_callback' => TRUE,
   );