diff --git a/Changelog.md b/Changelog.md
index 3e13b6269b503bf195a5442f2719c92564ea2aa6..2835f4c734e284e4367211a088177999eef65b81 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,7 @@
 
 ## Features
 * Add basic html5 audio/video embedding support [#6418](https://github.com/diaspora/diaspora/pull/6418)
+* Add the back-to-top button to all pages [#7729](https://github.com/diaspora/diaspora/pull/7729)
 
 # 0.7.3.1
 
diff --git a/app/assets/javascripts/app/views/back_to_top_view.js b/app/assets/javascripts/app/views/back_to_top_view.js
index 0289c8fb06ee14b85425f7ea086c3e20a6f43f2f..f04c76432bdea9b2a84b2ad7abd00c32fc901899 100644
--- a/app/assets/javascripts/app/views/back_to_top_view.js
+++ b/app/assets/javascripts/app/views/back_to_top_view.js
@@ -12,7 +12,7 @@ app.views.BackToTop = Backbone.View.extend({
 
   backToTop: function(evt) {
     evt.preventDefault();
-    $("html, body").animate({scrollTop: 0});
+    $("html, body").animate({scrollTop: 0}, this.toggleVisibility);
   },
 
   toggleVisibility: function() {
diff --git a/spec/javascripts/app/views/back_to_top_view_spec.js b/spec/javascripts/app/views/back_to_top_view_spec.js
index 726c1ae1b0a63621436c7758bce35b8da1005bbf..99d33b541e251aafdb6ab8c57fa43e036ba386a8 100644
--- a/spec/javascripts/app/views/back_to_top_view_spec.js
+++ b/spec/javascripts/app/views/back_to_top_view_spec.js
@@ -17,7 +17,7 @@ describe("app.views.BackToTop", function() {
     it("scrolls to the top of the page", function() {
       var spy = spyOn($.fn, "animate");
       this.view.backToTop($.Event());
-      expect(spy).toHaveBeenCalledWith({scrollTop: 0});
+      expect(spy).toHaveBeenCalledWith({scrollTop: 0}, jasmine.any(Function));
     });
   });