diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index fbe61c023..d9ab5f6be 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -2,6 +2,7 @@
  - fix: misspelled i18n in webgui password recovery
  - made captcha's harder to defeat by machine
  - rfe: Make Layout Templates use separate namespace (News)
+ - rfe: search assets on class without keywords
  - fix: crash bug in if modified cache checking
  - rfe: Change URL of "news" layout to be something else.
  - add type variable to Data Form record loop
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index b681b65b8..6adf31963 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1572,7 +1572,7 @@ sub manageAssetsSearch {
 	$output .= WebGUI::Form::formFooter($self->session);
 	$self->session->output->print($output);
 	$output = '';
-	return undef unless ($self->session->form->get("doit") && $self->session->form->get("keywords") ne "");
+	return undef unless ($self->session->form->get("doit") && ($self->session->form->get("keywords") ne "" || $self->session->form->get("class") ne "any"));
 	my $class = $self->session->form->process("class","className") eq "any" ? undef : $self->session->form->process("class","className");
 	my $assets = WebGUI::Search->new($self->session,0)->search({
 		keywords=>$self->session->form->get("keywords"),