diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index c465f890dd..2de9968983 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -61,11 +61,6 @@ table td.filename .nametext .innernametext {
 	max-width: 50%;
 }
 
-/* ellipsis on user names in share sidebar, less on mobile */
-#shareWithList .username {
-	max-width: 80px !important;
-}
-
 /* proper notification area for multi line messages */
 #notification-container {
 	display: -webkit-box;
diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 6ac6dff0a6..35b2d2f337 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -56,6 +56,8 @@
 	padding-bottom: 5px;
 	font-weight: bold;
 	white-space: normal;
+	display: inline-flex;
+	align-items: center;
 }
 
 #shareWithList .unshare img, #shareWithList .showCruds img {
@@ -89,7 +91,6 @@
 	padding-right: 8px;
 	white-space: nowrap;
 	text-overflow: ellipsis;
-	max-width: 110px;
 	display: inline-block;
 	overflow: hidden;
 	vertical-align: middle;
diff --git a/core/css/share.css b/core/css/share.css
index 9a98491276..05b6ca3912 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -74,16 +74,18 @@
 	font-weight: bold;
 	line-height: 21px;
 	white-space: normal;
+	width: 100%;
 }
 
 #shareWithList .sharingOptionsGroup {
-	position: absolute;
-	right: 15px;
+	flex-shrink: 0;
+	position: relative;
 }
 
 #shareWithList .sharingOptionsGroup .popovermenu {
-	right: -14px;
+	right: -6px;
 	top: 40px;
+	padding: 3px 6px;
 }
 
 #shareWithList .shareOption {
@@ -103,10 +105,10 @@
 	padding-right: 8px;
 	white-space: nowrap;
 	text-overflow: ellipsis;
-	max-width: 254px;
 	display: inline-block;
 	overflow: hidden;
 	vertical-align: middle;
+	flex-grow: 5;
 }
 #shareWithList li label{
 	margin-right: 8px;