diff --git a/plugins/content_types/node_context/node_created.inc b/plugins/content_types/node_context/node_created.inc
index 41c8b83..b06c84f 100644
--- a/plugins/content_types/node_context/node_created.inc
+++ b/plugins/content_types/node_context/node_created.inc
@@ -43,14 +43,18 @@ function ctools_node_created_content_type_render($subtype, $conf, $panel_args, $
 function ctools_node_created_content_type_edit_form($form, &$form_state) {
   $conf = $form_state['conf'];
 
+  $types = system_get_date_types();
+  $options = array();
+
+  foreach ($types as $type => $type_info) {
+    $formatted_date = format_date(REQUEST_TIME, $type);
+    $options[$type] = "{$formatted_date} ({$type_info['title']})";
+  }
+
   $form['format'] = array(
     '#title' => t('Date format'),
     '#type' => 'select',
-    '#options' => array(
-      'small' => format_date(REQUEST_TIME, 'small'),
-      'medium' => format_date(REQUEST_TIME, 'medium'),
-      'large' => format_date(REQUEST_TIME, 'large'),
-    ),
+    '#options' => $options,
     '#default_value' => $conf['format'],
   );
   return $form;
diff --git a/plugins/content_types/node_context/node_updated.inc b/plugins/content_types/node_context/node_updated.inc
index 076eb06..38d4962 100644
--- a/plugins/content_types/node_context/node_updated.inc
+++ b/plugins/content_types/node_context/node_updated.inc
@@ -43,14 +43,18 @@ function ctools_node_updated_content_type_render($subtype, $conf, $panel_args, $
 function ctools_node_updated_content_type_edit_form($form, &$form_state) {
   $conf = $form_state['conf'];
 
+  $types = system_get_date_types();
+  $options = array();
+
+  foreach ($types as $type => $type_info) {
+    $formatted_date = format_date(REQUEST_TIME, $type);
+    $options[$type] = "{$formatted_date} ({$type_info['title']})";
+  }
+
   $form['format'] = array(
     '#title' => t('Date format'),
     '#type' => 'select',
-    '#options' => array(
-      'small' => format_date(REQUEST_TIME, 'small'),
-      'medium' => format_date(REQUEST_TIME, 'medium'),
-      'large' => format_date(REQUEST_TIME, 'large'),
-    ),
+    '#options' => $options,
     '#default_value' => $conf['format'],
   );
   return $form;