diff --git a/modules/node/node.module b/modules/node/node.module
index 79e2773ab475c6ab546818d2c5b199f9956d9fe5..9f0508c76f29fd86c1f99f351730d5c28fc0e061 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -2292,7 +2292,7 @@ function node_add($type) {
     // Initialize settings:
     $node = array('uid' => $user->uid, 'name' => $user->name, 'type' => $type, 'language' => '');
 
-    drupal_set_title(t('Submit @name', array('@name' => $types[$type]->name)));
+    drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)));
     $output = drupal_get_form($type .'_node_form', $node);
   }
 
@@ -2565,7 +2565,7 @@ function node_page_edit($node) {
     drupal_goto('node/'. $node->nid .'/delete', $destination);
   }
 
-  drupal_set_title(check_plain($node->title));
+  drupal_set_title(t('Edit %title', array('%title' => $node->title)));
   return drupal_get_form($node->type .'_node_form', $node);
 }