diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index c0456192d..0a6f22ae5 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -1,4 +1,6 @@
 <?php
+define('WP_ADMIN', TRUE);
+
 if ( defined('ABSPATH') )
 	require_once( ABSPATH . 'wp-config.php');
 else
diff --git a/wp-includes/query.php b/wp-includes/query.php
index df99d681f..fae510ea7 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -32,9 +32,9 @@ function wp_reset_query() {
  */
 
 function is_admin () {
-	global $wp_query;
-
-	return ($wp_query->is_admin || (stripos($_SERVER['REQUEST_URI'], 'wp-admin/') !== false));
+	if ( defined('WP_ADMIN') ) 
+		return WP_ADMIN;
+	return false;
 }
 
 function is_archive () {