diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 3c87ba884f..790abf1b58 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -437,7 +437,7 @@ function get_body_class( $class = '' ) {
 		}
 		if ( is_page_template() ) {
 			$classes[] = 'page-template';
-			$classes[] = 'page-template-' . str_replace( '.php', '-php', get_post_meta( $pageID, '_wp_page_template', true ) );
+			$classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', get_post_meta( $pageID, '_wp_page_template', true ) ), '' );
 		}
 	} elseif ( is_search() ) {
 		if ( !empty($wp_query->posts) )