diff --git a/src/wp-includes/meta.php b/src/wp-includes/meta.php
index 1b72ca317a..cb83e4600e 100644
--- a/src/wp-includes/meta.php
+++ b/src/wp-includes/meta.php
@@ -972,6 +972,7 @@ class WP_Meta_Query {
 				$where["key-only-$key"] = $wpdb->prepare( "$meta_table.meta_key = %s", trim( $q['key'] ) );
 		}
 
+		$where_meta_key = array();
 		foreach ( $queries as $k => $q ) {
 			$meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
 			$meta_type = $this->get_cast_for_type( isset( $q['type'] ) ? $q['type'] : '' );
@@ -1014,12 +1015,18 @@ class WP_Meta_Query {
 			$join[$i] .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)";
 
 			$where[$k] = '';
-			if ( !empty( $meta_key ) )
-				$where[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
+			if ( ! empty( $meta_key ) ) {
+				if ( isset( $q['compare'] ) ) {
+					$where_meta_key[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
+				} else {
+					$where[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
+				}
+			}
 
 			if ( is_null( $meta_value ) ) {
-				if ( empty( $where[$k] ) )
+				if ( empty( $where[$k] ) && empty( $where_meta_key ) ) {
 					unset( $join[$i] );
+				}
 				continue;
 			}
 
@@ -1060,6 +1067,10 @@ class WP_Meta_Query {
 		else
 			$where = ' AND (' . implode( "\n{$this->relation} ", $where ) . ' )';
 
+		if ( ! empty( $where_meta_key ) ) {
+			$where .= "\nAND " . implode( "\nAND ", $where_meta_key );
+		}
+
 		$join = implode( "\n", $join );
 		if ( ! empty( $join ) )
 			$join = ' ' . $join;
diff --git a/tests/phpunit/tests/meta.php b/tests/phpunit/tests/meta.php
index 5d6413a5f6..774da643c6 100644
--- a/tests/phpunit/tests/meta.php
+++ b/tests/phpunit/tests/meta.php
@@ -197,4 +197,43 @@ class Tests_Meta extends WP_UnitTestCase {
 				wp_cache_delete( $post_id, 'post_meta' );
 		}
 	}
+
+	function test_query_meta_query_order() {
+		$post1 = $this->factory->post->create( array( 'post_title' => 'meta-value-1', 'post_date' => '2007-01-01 00:00:00' ) );
+		$post2 = $this->factory->post->create( array( 'post_title' => 'meta-value-2', 'post_date' => '2007-01-01 00:00:00' ) );
+		$post3 = $this->factory->post->create( array( 'post_title' => 'meta-value-3', 'post_date' => '2007-01-01 00:00:00' ) );
+
+		add_post_meta( $post1, 'order', 1 );
+		add_post_meta( $post2, 'order', 2 );
+		add_post_meta( $post3, 'order', 3 );
+
+		$args = array(
+			'post_type' => 'post',
+			'meta_key' => 'order',
+			'meta_value' => 1,
+			'meta_compare' => '>=',
+			'orderby' => 'meta_value'
+		);
+
+		$args2 = array(
+			'post_type' => 'post',
+			'meta_key' => 'order',
+			'meta_value' => 1,
+			'meta_compare' => '>=',
+			'orderby' => 'meta_value',
+			'meta_query' => array(
+				'relation' => 'OR',
+				array(
+					'key' => 'order',
+					'compare' => '>=',
+					'value' => 1
+				)
+			)
+		);
+
+		$posts = get_posts( $args );
+		$posts2 = get_posts( $args2 );
+
+		$this->assertEquals( wp_list_pluck( $posts, 'post_title' ), wp_list_pluck( $posts2, 'post_title' ) );
+	}
 }