diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index a54ca8c563..ecc3536b1e 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -57,7 +57,7 @@ if (empty($post->post_status)) $post->post_status = 'draft';
 <input type="hidden" id="post_type" name="post_type" value="post" />
 
 <?php echo $form_extra ?>
-<?php if (isset($_GET['message']) && 2 > $_GET['message']) : ?>
+<?php if ((isset($post->post_title) && '' == $post->post_title) || (isset($_GET['message']) && 2 > $_GET['message'])) : ?>
 <script type="text/javascript">
 function focusit() {
 	// focus on first input field