diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss
index 1e9dec87fa..e040d44912 100644
--- a/apps/files_sharing/css/public.scss
+++ b/apps/files_sharing/css/public.scss
@@ -88,15 +88,6 @@ thead {
 	opacity: .5;
 }
 
-#directLink-container {
-	flex-wrap: wrap;
-}
-
-#directLink {
-	margin-left: 30px;
-	flex-basis: 100%;
-}
-
 /* header buttons */
 #details {
 	display: inline-flex;
diff --git a/apps/files_sharing/lib/Template/LinkMenuAction.php b/apps/files_sharing/lib/Template/LinkMenuAction.php
index 2fdf83e702..519bc55322 100644
--- a/apps/files_sharing/lib/Template/LinkMenuAction.php
+++ b/apps/files_sharing/lib/Template/LinkMenuAction.php
@@ -47,8 +47,12 @@ class LinkMenuAction extends SimpleMenuAction {
 			'<a id="directLink-container">' .
 			'<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
 			'<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
-			'<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
 			'</a>' .
+			'</li>' .
+			'<li>' .
+			'<span class="menuitem">' .
+			'<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
+			'</span>' .
 			'</li>';
 	}
-}
\ No newline at end of file
+}
diff --git a/core/css/header.scss b/core/css/header.scss
index 35e756cfcd..86739240ae 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -84,6 +84,7 @@
 		max-height: 280px;
 		right: 0;
 		top: 44px;
+		margin: 0;
 
 		&:not(.popovermenu) {
 			display: none;
diff --git a/core/css/public.scss b/core/css/public.scss
index 3651e701c3..6a175de643 100644
--- a/core/css/public.scss
+++ b/core/css/public.scss
@@ -1,22 +1,22 @@
 #body-public {
-  .header-right {
+	.header-right {
 
-    span:not(.popovermenu) a {
-      color: $color-primary-text;
-    }
+		span:not(.popovermenu) a {
+			color: $color-primary-text;
+		}
 
-    .menutoggle,
-    #header-primary-action[class^='icon-'] {
-      padding: 14px;
-      padding-right: 40px;
-      background-position: right 15px center;
-      color: $color-primary-text;
-      cursor: pointer;
-    }
+		.menutoggle,
+		#header-primary-action[class^='icon-'] {
+			padding: 14px;
+			padding-right: 40px;
+			background-position: right 15px center;
+			color: $color-primary-text;
+			cursor: pointer;
+		}
 
-    .menutoggle {
-      padding-right: 10px;
-    }
+		#header-secondary-action {
+			margin-right: 13px;
+		}
 
-  }
-}
\ No newline at end of file
+	}
+}
diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
index b9451fe05a..d3c12f8fd9 100644
--- a/core/templates/layout.public.php
+++ b/core/templates/layout.public.php
@@ -54,16 +54,18 @@
 				</a>
 			</span>
 			<?php if($template->getActionCount()>1) { ?>
-			<span id="header-actions-toggle" class="menutoggle icon-more-white"></span>
-			<div id="share-menu" class="popovermenu menu">
-				<ul>
-					<?php
-						/** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
-						foreach($template->getOtherActions() as $action) {
-							print_unescaped($action->render());
-						}
-					?>
-				</ul>
+			<div id="header-secondary-action">
+				<span id="header-actions-toggle" class="menutoggle icon-more-white"></span>
+				<div id="share-menu" class="popovermenu menu">
+					<ul>
+						<?php
+							/** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
+							foreach($template->getOtherActions() as $action) {
+								print_unescaped($action->render());
+							}
+						?>
+					</ul>
+				</div>
 			</div>
 			<?php } ?>
 		</div>