diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 96776d4e3e..3662069775 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -60,7 +60,7 @@ $saveasdraft = '<input name="save" type="submit" id="save" class="button" tabind
 <input name="referredby" type="hidden" id="referredby" value="<?php
 if ( !empty($_REQUEST['popupurl']) )
 	echo clean_url(stripslashes($_REQUEST['popupurl']));
-else if ( url_to_postid(wp_get_referer()) == $post_ID && strpos( wp_get_referer(), '/wp-admin/' ) === false )
+else if ( strpos( wp_get_referer(), '/wp-admin/' ) === false && url_to_postid(wp_get_referer()) == $post_ID  )
 	echo 'redo';
 else
 	echo clean_url(stripslashes(wp_get_referer()));
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index 1a4025fc7d..b65b2e5bdc 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -48,7 +48,7 @@ if (isset($mode) && 'bookmarklet' == $mode)
 <input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
 <input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
 <input name="referredby" type="hidden" id="referredby" value="<?php
-if ( url_to_postid(wp_get_referer()) == $post_ID && strpos( wp_get_referer(), '/wp-admin/' ) === false )
+if ( strpos( wp_get_referer(), '/wp-admin/' ) === false && url_to_postid(wp_get_referer()) == $post_ID )
 	echo 'redo';
 else
 	echo clean_url(stripslashes(wp_get_referer()));