diff --git a/src/wp-includes/template.php b/src/wp-includes/template.php
index 636cb9005c..01f9c8a715 100644
--- a/src/wp-includes/template.php
+++ b/src/wp-includes/template.php
@@ -418,10 +418,10 @@ function get_page_template() {
 		if ( $pagename_decoded !== $pagename ) {
 			$templates[] = "page-{$pagename_decoded}.php";
 		}
-		$templates[] = "page-$pagename.php";
+		$templates[] = "page-{$pagename}.php";
 	}
 	if ( $id )
-		$templates[] = "page-$id.php";
+		$templates[] = "page-{$id}.php";
 	$templates[] = 'page.php';
 
 	return get_query_template( 'page', $templates );