diff --git a/wp-admin/includes/template-functions.php b/wp-admin/includes/template-functions.php
index 54d0a0a889..91a50fc5a7 100644
--- a/wp-admin/includes/template-functions.php
+++ b/wp-admin/includes/template-functions.php
@@ -1631,12 +1631,14 @@ function _post_states($post) {
 		$post_states['scheduled'] = __( 'Scheduled' );
 	}
 
-	if ( get_option( 'page_on_front' ) == $post->ID ) {
-		$post_states['page_on_front'] = __( 'Front Page' );
-	}
+	if ( 'page' === get_option( 'show_on_front' ) ) {
+		if ( intval( get_option( 'page_on_front' ) ) === $post->ID ) {
+			$post_states['page_on_front'] = __( 'Front Page' );
+		}
 
-	if ( get_option( 'page_for_posts' ) == $post->ID ) {
-		$post_states['page_for_posts'] = __( 'Posts Page' );
+		if ( intval( get_option( 'page_for_posts' ) ) === $post->ID ) {
+			$post_states['page_for_posts'] = __( 'Posts Page' );
+		}
 	}
 
 	/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index db917f4aaa..a5cb43d0a8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34604';
+$wp_version = '4.4-alpha-34605';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.