diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index db80bf8031..3d3f1adef4 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -823,7 +823,7 @@ function meta_form() {
 	</tr>
 <tr class="submit"><td colspan="3">
 	<?php wp_nonce_field( 'add-meta', '_ajax_nonce', false ); ?>
-	<input type="submit" id="addmetasub" name="addmeta" class="add:the-list:newmeta::post_id=<?php echo $GLOBALS['post_ID'] ? $GLOBALS['post_ID'] : $GLOBALS['temp_ID']; ?>" tabindex="9" value="<?php _e( 'Add Custom Field' ) ?>" />
+	<input type="submit" id="addmetasub" name="addmeta" class="add:the-list:newmeta" tabindex="9" value="<?php _e( 'Add Custom Field' ) ?>" />
 </td></tr>
 </table>
 <?php
diff --git a/wp-admin/js/post.js b/wp-admin/js/post.js
index c938af3015..fc8b5e4b5d 100644
--- a/wp-admin/js/post.js
+++ b/wp-admin/js/post.js
@@ -177,5 +177,9 @@ jQuery(document).ready( function() {
 		if ( jQuery.isFunction( autosave_update_post_ID ) ) {
 			autosave_update_post_ID(s.parsed.responses[0].supplemental.postid);
 		}
-	} });
+	}, addBefore: function( s ) {
+		s.data += '&post_id=' + jQuery('#post_ID').val();
+		return s;
+	}
+	});
 });