diff --git a/services/web/public/coffee/ide/LinkSharingOnboardingController.coffee b/services/web/public/coffee/ide/LinkSharingOnboardingController.coffee
index 60897abb35..d2e6ae711e 100644
--- a/services/web/public/coffee/ide/LinkSharingOnboardingController.coffee
+++ b/services/web/public/coffee/ide/LinkSharingOnboardingController.coffee
@@ -15,7 +15,7 @@ define [
 			offset = shareBtn.offset()
 			popover.show()
 			$scope.placement = 'bottom'
-			popover.offset({
-				top: offset.top + 11 + shareBtn.height(),
-				left: offset.left - 180
+			popover.css({
+				top: '' + (2) + 'px',
+				right: '' + (window.innerWidth - offset.left - (shareBtn.width() * 1.5) ) + 'px'
 			})
diff --git a/services/web/public/stylesheets/app/editor/feature-onboarding.less b/services/web/public/stylesheets/app/editor/feature-onboarding.less
index 2a5c66d262..1e41fecad2 100644
--- a/services/web/public/stylesheets/app/editor/feature-onboarding.less
+++ b/services/web/public/stylesheets/app/editor/feature-onboarding.less
@@ -147,6 +147,9 @@ a.feat-onboard-dismiss {
 .onboarding-linksharing {
 	display: block;
 	top: 10px;
+	&.popover {
+		left: auto !important;
+	}
 
 	img {
 		margin-bottom: 10px;