diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index cbc764baa..2fd087db5 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1519,7 +1519,7 @@ function is_trackback () {
 function is_admin () {
 	global $wp_query;
 
-	return $wp_query->is_admin;
+	return ( $wp_query->is_admin || strstr($_SERVER['REQUEST_URI'], 'wp-admin/') );
 }
 
 function is_home () {