diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index c3b1243f87e..509d867baf9 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -219,7 +219,7 @@ input {
 
 .federationScopeMenu {
 	top: 44px;
-	margin: -5px 5px 0;
+	margin-right: calc(-50% + 30px); /* half - the triangle icon width - borders */
 	&.bubble::after {
 		right: 50%;
 		transform: translate(50%, 0);
diff --git a/settings/js/federationscopemenu.js b/settings/js/federationscopemenu.js
index a9f41831b94..467ca48f62d 100644
--- a/settings/js/federationscopemenu.js
+++ b/settings/js/federationscopemenu.js
@@ -137,16 +137,6 @@
 			this.$el.removeClass('hidden');
 
 			OC.showMenu(null, this.$el);
-
-			//Set the menuwidth
-			var menuWidth = this.$el.width();
-			this.$el.css('width', menuWidth);
-
-			//Calculate menu position
-			var l = offsetIcon.left - offsetHeading.left;
-			l = l - (menuWidth / 2) + ($el.outerWidth()/2);
-			this.$el.css('left', l);
-
 		}
 	});