diff --git a/packages/component-faraday-ui/src/pending/ControlledAccordion.js b/packages/component-faraday-ui/src/pending/ControlledAccordion.js
index a931f48c2b481d599c3f8de50454ccdd2109fbb8..0c63d576edfad292aeb7f5be3d6509b82e9e52c5 100644
--- a/packages/component-faraday-ui/src/pending/ControlledAccordion.js
+++ b/packages/component-faraday-ui/src/pending/ControlledAccordion.js
@@ -17,11 +17,17 @@ const HeaderComponent = ({ icon, label, toggle, expanded, ...props }) => (
 )
 
 class ControlledAccordion extends React.Component {
+  componentDidMount() {
+    this.scroller = document.querySelector('.faraday-root')
+  }
   componentDidUpdate(prevProps) {
     const shouldScroll = !prevProps.expanded && this.props.expanded
 
     if (this.props.scrollIntoView && shouldScroll) {
-      this._accordion.scrollIntoView && this._accordion.scrollIntoView()
+      const appBarHeight = 70 // TODO -- take height from constants
+      const appBarMargin = 16 // TODO -- take margin from constants
+      this.scroller.scrollTop =
+        this._accordion.offsetTop - appBarHeight - appBarMargin
     }
   }