diff --git a/modules/node/node.module b/modules/node/node.module
index f181b52..3096499 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1130,14 +1130,14 @@ function node_save($node) {
     $function = "field_attach_$op";
     $function('node', $node);
 
-    module_invoke_all('node_' . $op, $node);
-    module_invoke_all('entity_' . $op, $node, 'node');
-
     // Update the node access table for this node. There's no need to delete
     // existing records if the node is new.
     $delete = $op == 'update';
     node_access_acquire_grants($node, $delete);
 
+    module_invoke_all('node_' . $op, $node);
+    module_invoke_all('entity_' . $op, $node, 'node');
+
     // Clear internal properties.
     unset($node->is_new);
     unset($node->original);
diff --git a/modules/node/node.test b/modules/node/node.test
index 9ef4c25..adb02fa 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -1292,6 +1292,22 @@ class NodeSaveTestCase extends DrupalWebTestCase {
     $node = node_load($node->nid);
     $this->assertEqual($node->title, 'updated_presave', 'Static cache has been cleared.');
   }
+
+  /**
+   * Tests saving a node on node insert.
+   *
+   * This test ensures that a node has been fully saved when hook_node_insert()
+   * is invoked, so that the node can be saved again in a hook implementation
+   * without errors.
+   *
+   * @see node_test_node_insert()
+   */
+  function testNodeSaveOnInsert() {
+    // node_test_node_insert() tiggers a save on insert if the title equals
+    // 'new'.
+    $node = $this->drupalCreateNode(array('title' => 'new'));
+    $this->assertEqual($node->title, 'Node ' . $node->nid, 'Node saved on node insert.');
+  }
 }
 
 /**
diff --git a/modules/node/tests/node_test.module b/modules/node/tests/node_test.module
index a52c1fa..25a5138 100644
--- a/modules/node/tests/node_test.module
+++ b/modules/node/tests/node_test.module
@@ -159,3 +159,18 @@ function node_test_entity_view_mode_alter(&$view_mode, $context) {
     $view_mode = $change_view_mode;
   }
 }
+
+/**
+ * Implements hook_node_insert().
+ *
+ * This tests saving a node on node insert.
+ *
+ * @see NodeSaveTest::testNodeSaveOnInsert()
+ */
+function node_test_node_insert(Node $node) {
+  // Set the node title to the node ID and save.
+  if ($node->title == 'new') {
+    $node->title = 'Node '. $node->nid;
+    node_save($node);
+  }
+}