diff --git a/context_ui/context_ui.module b/context_ui/context_ui.module
index 296db806e49953b6d319f28401b19a670a76795e..86b75e88f6141ec3f2ad2eb750ff76e99094b377 100644
--- a/context_ui/context_ui.module
+++ b/context_ui/context_ui.module
@@ -351,7 +351,9 @@ function context_ui_editor_submit(&$form, &$form_state) {
     $context = context_ui_editor_process($values);
     if (($original->conditions !== $context->conditions) || ($original->reactions !== $context->reactions)) {
       if (context_save($context)) {
-        drupal_set_message(t('Saved context %title.', array('%title' =>  $context->name)));
+        drupal_set_message(t('Saved %title.', array(
+          '%title' => (!empty($context->description) ? $context->description : $context->name)
+        )));
       }
       else {
         drupal_set_message(t('Could not save context %title.', array('%title' =>  $context->name)), 'error');