diff --git a/Changelog.md b/Changelog.md
index 5388db779..31242dd57 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -47,6 +47,7 @@ The default for including jQuery from a CDN has changed. If you want to continue
 * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)
 * Move submit button to the right in conversations view [#4960](https://github.com/diaspora/diaspora/pull/4960)
 * Handle long URLs and titles in OpenGraph descriptions [#5208](https://github.com/diaspora/diaspora/pull/5208)
+* Fix deformed getting started popover [#5227](https://github.com/diaspora/diaspora/pull/5227)
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
diff --git a/app/assets/javascripts/app/views/publisher/getting_started_view.js b/app/assets/javascripts/app/views/publisher/getting_started_view.js
index f3e6142cd..fd0f921bf 100644
--- a/app/assets/javascripts/app/views/publisher/getting_started_view.js
+++ b/app/assets/javascripts/app/views/publisher/getting_started_view.js
@@ -21,21 +21,24 @@ app.views.PublisherGettingStarted = Backbone.View.extend({
       offset: 30,
       id: 'first_message_explain',
       placement: 'right',
-      html: true
+      html: true,
+      container: 'body'
     }, 600);
     this._addPopover(this.el_visibility, {
       trigger: 'manual',
       offset: 10,
       id: 'message_visibility_explain',
       placement: 'bottom',
-      html: true
+      html: true,
+      container: 'body'
     }, 1000);
     this._addPopover(this.el_stream, {
       trigger: 'manual',
       offset: -5,
       id: 'stream_explain',
       placement: 'left',
-      html: true
+      html: true,
+      container: 'body'
     }, 1400);
 
     // hide some popovers when a post is created