diff --git a/src/components/structures/IndicatorScrollbar.js b/src/components/structures/IndicatorScrollbar.js
index 263a0a22ba..03e1f8db04 100644
--- a/src/components/structures/IndicatorScrollbar.js
+++ b/src/components/structures/IndicatorScrollbar.js
@@ -40,6 +40,13 @@ export default class IndicatorScrollbar extends React.Component {
         };
     }
 
+    moveToOrigin() {
+        if (!this._scrollElement) return;
+
+        this._scrollElement.scrollLeft = 0;
+        this._scrollElement.scrollTop = 0;
+    }
+
     _collectScroller(scroller) {
         if (scroller && !this._scrollElement) {
             this._scrollElement = scroller;
diff --git a/src/components/views/rooms/RoomBreadcrumbs.js b/src/components/views/rooms/RoomBreadcrumbs.js
index 43dcabdf96..19420684c4 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.js
+++ b/src/components/views/rooms/RoomBreadcrumbs.js
@@ -189,6 +189,10 @@ export default class RoomBreadcrumbs extends React.Component {
             rooms.splice(MAX_ROOMS, rooms.length - MAX_ROOMS);
         }
         this.setState({rooms});
+
+        if (this.refs.scroller) {
+            this.refs.scroller.moveToOrigin();
+        }
     }
 
     _viewRoom(room) {