diff --git a/software/index.cgi b/software/index.cgi
index 607a6ae53..7135adf7b 100755
--- a/software/index.cgi
+++ b/software/index.cgi
@@ -24,14 +24,11 @@ if ($err) {
 # Show package search and list forms
 print &ui_subheading($text{'index_installed'});
 print "<table width=100%><tr>\n";
-print &ui_form_start("search.cgi");
-print "<td>",&ui_submit($text{'index_search'}),"\n";
-print &ui_textbox("search", undef, 40),"</td>\n";
-print &ui_hidden("goto", 1),&ui_form_end();
+print "<td>",&ui_form_start("search.cgi"),&ui_submit($text{'index_search'}),"\n";
+print &ui_textbox("search", undef, 40),&ui_hidden("goto", 1),&ui_form_end(),"</td>\n";
 
-print &ui_form_start("tree.cgi");
-print "<td align=right>",&ui_submit($text{'index_tree'}),"</td>\n";
-print &ui_form_end();
+print "<td align=right>",&ui_form_start("tree.cgi"),
+	&ui_submit($text{'index_tree'}),&ui_form_end(),"</td>\n";
 print "</tr></table>\n";
 
 # Show form to install a new package