diff --git a/app/core/Router.coffee b/app/core/Router.coffee
index 60b28886e..76bc0f224 100644
--- a/app/core/Router.coffee
+++ b/app/core/Router.coffee
@@ -184,6 +184,8 @@ module.exports = class CocoRouter extends Backbone.Router
     return unless window.currentView?
     window.currentView.destroy()
     $('.popover').popover 'hide'
+    $('#flying-focus').css({top: 0, left: 0}) # otherwise it might make the page unnecessarily tall
+    _.delay (-> $('body')[0].scrollTop = 0), 10
 
   onGPlusAPILoaded: =>
     @renderLoginButtons()