diff --git a/src/wp-admin/js/theme.js b/src/wp-admin/js/theme.js
index f06fb81b19..c13f917b57 100644
--- a/src/wp-admin/js/theme.js
+++ b/src/wp-admin/js/theme.js
@@ -190,6 +190,12 @@ themes.Collection = Backbone.Collection.extend({
 			return match.test( haystack );
 		});
 
+		if ( results.length === 0 ) {
+			this.trigger( 'query:empty' );
+		} else {
+			$( 'body' ).removeClass( 'no-results' );
+		}
+
 		this.reset( results );
 	},
 
diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
index 0117c0dd81..ad5896cc56 100644
--- a/src/wp-admin/themes.php
+++ b/src/wp-admin/themes.php
@@ -233,6 +233,8 @@ foreach ( $themes as $theme ) :
 </div>
 <div class="theme-overlay"></div>
 
+<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
+
 <?php
 // List broken themes, if any.
 if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {