diff --git a/wp-admin/post.php b/wp-admin/post.php
index e0620ab336..b73a05ec4f 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -22,8 +22,9 @@ if (isset($_POST['deletepost'])) {
 $action = "delete";
 }
 
-	// Fix submenu highlighting for pages.
-if (false !== strpos($_SERVER['HTTP_REFERER'], 'edit-pages.php')) $submenu_file = 'page-new.php';
+// Fix submenu highlighting for pages.
+if ( isset($_REQUEST['post']) && 'static' == get_post_status($_REQUEST['post']) )
+	$submenu_file = 'page-new.php';
 
 $editing = true;