diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index 24b4739b..6ce96159 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -528,7 +528,7 @@ function pkg_search_page($SID="") {
 	}
 
 
-	if ($total > 1) {
+	if ($total > 1 || $total == 0) {
 		include('pkg_search_form.php');
 		include('pkg_search_results.php');
 	}
diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php
index a933c014..bdb5f6cb 100644
--- a/web/template/pkg_search_results.php
+++ b/web/template/pkg_search_results.php
@@ -1,14 +1,13 @@
 <form action='packages.php?<?php echo htmlentities($_SERVER['QUERY_STRING']) ?>' method='post'>
 <div class="pgbox">
-		<div class="pgboxtitle">
-			<span class='f3'><?php print __("Package Listing") ?></span>
-		</div>
-
 <?php if (!$result) { ?>
 <div class='pgboxbody'><?php print __("Error retrieving package list.") ?></div>
 <?php } elseif ($total == 0) { ?>
 <div class='pgboxbody'><?php print __("No packages matched your search criteria.") ?></div>
 <?php } else { ?>
+	<div class="pgboxtitle">
+		<span class='f3'><?php print __("Package Listing") ?></span>
+	</div>
 
 <table width='100%' cellspacing='0' cellpadding='2'>
 <tr>