Index: wp-includes/post-template.php
===================================================================
--- wp-includes/post-template.php	(revision 20460)
+++ wp-includes/post-template.php	(working copy)
@@ -491,7 +491,9 @@
 		} else {
 			$classes[] = 'page-template-default';
 		}
-	} elseif ( is_search() ) {
+	}
+
+	if ( is_search() ) {
 		if ( !empty( $wp_query->posts ) )
 			$classes[] = 'search-results';
 		else