diff --git a/core/ajax/share.php b/core/ajax/share.php
index 332b6a0bed8bec339db95249d862ae3c243a522f..9201b48cb954af5849b0b19334a376b37486a444 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -185,8 +185,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				$users = array();
 				$limit = 0;
 				$offset = 0;
-				while ($count < 4 && count($users) == $limit) {
-					$limit = 4 - $count;
+				while ($count < 15 && count($users) == $limit) {
+					$limit = 15 - $count;
 					if ($sharePolicy == 'groups_only') {
 						$users = OC_Group::DisplayNamesInGroups($groups, $_GET['search'], $limit, $offset);
 					} else {
@@ -209,7 +209,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				}
 				$count = 0;
 				foreach ($groups as $group) {
-					if ($count < 4) {
+					if ($count < 15) {
 						if (stripos($group, $_GET['search']) !== false
 							&& (!isset($_GET['itemShares'])
 							|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
diff --git a/core/css/share.css b/core/css/share.css
index 2480a571ae552d59057e22425437ccfd3325ad9a..2d6849b4bb1361b1978906716ce0974fd7d1c643 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -91,3 +91,9 @@
  }
 
 .reshare { white-space:normal; } /* fix shared by text going out of box */
+
+.ui-autocomplete { /* limit dropdown height to 4 1/2 entries */
+	max-height:103px;
+	overflow-y:auto;
+	overflow-x:hidden;
+}