diff --git a/wp-blog-header.php b/wp-blog-header.php
index b82a8cac4f..840c6cfb15 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -210,6 +210,11 @@ if ($pagenow == 'index.php') {
 			$wp_did_template_redirect = true;
 			include(dirname(__FILE__) . '/wp-trackback.php');
 			exit;
+		} else if (is_404() &&
+							 file_exists("$wp_template_dir/404.php")) {
+			$wp_did_template_redirect = true;
+			include("$wp_template_dir/404.php");
+			exit;
 		} else if (is_home() && 
 				file_exists("$wp_template_dir/index.php")) {
 			$wp_did_template_redirect = true;
@@ -250,11 +255,6 @@ if ($pagenow == 'index.php') {
 			$wp_did_template_redirect = true;
 			include("$wp_template_dir/search.php");
 			exit;
-		} else if (is_404() &&
-							 file_exists("$wp_template_dir/404.php")) {
-			$wp_did_template_redirect = true;
-			include("$wp_template_dir/404.php");
-			exit;
 		} else if (file_exists("$wp_template_dir/index.php"))
 			{
 				$wp_did_template_redirect = true;