diff --git a/core/css/styles.css b/core/css/styles.css
index 21583d6198..3ba617cb7a 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -628,6 +628,7 @@ label.infield {
 .avatardiv,
 .avatardiv img {
 	border-radius: 50%;
+	flex-shrink: 0;
 }
 td.avatar {
 	border-radius: 0;
diff --git a/core/js/jquery-ui-fixes.js b/core/js/jquery-ui-fixes.js
new file mode 100644
index 0000000000..9ccaa38cc4
--- /dev/null
+++ b/core/js/jquery-ui-fixes.js
@@ -0,0 +1,8 @@
+// Various jquery fixes
+
+// Set autocomplete width the same as the related input
+// See http://stackoverflow.com/a/11845718
+jQuery.ui.autocomplete.prototype._resizeMenu = function () {
+	var ul = this.menu.element;
+	ul.outerWidth(this.element.outerWidth());
+}
diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php
index 7c0b58db0c..a07bf214f3 100644
--- a/lib/private/legacy/template.php
+++ b/lib/private/legacy/template.php
@@ -147,6 +147,7 @@ class OC_Template extends \OC\Template\Base {
 			OC_Util::addScript("js", null, true);
 			OC_Util::addScript("oc-dialogs", null, true);
 			OC_Util::addScript("jquery.ocdialog", null, true);
+			OC_Util::addScript("jquery-ui-fixes");
 			OC_Util::addStyle("jquery.ocdialog");
 			OC_Util::addScript('files/fileinfo');
 			OC_Util::addScript('files/client');