diff --git a/style/pws.css b/style/pws.css
index 22eeca0..5a2ae96 100644
--- a/style/pws.css
+++ b/style/pws.css
@@ -67,5 +67,6 @@ span.button {
 }
 
 #addpassword {
+	display: none;
 }
 
diff --git a/templates/search.tpl b/templates/search.tpl
index 1f9fb9d..4c2bb42 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -30,7 +30,7 @@
 				</tr>
 				<tr>
 					<td>Available in groups</td>
-					<td><select name="pwgroups[]"></select></td>
+					<td><select name="pwgroups[]" multiple="multiple" size="5" id="addpw_grouplist"></select></td>
 				</tr>
 			</table>
 			<input type="button" id="save_password" value="Save" class="submit" />