diff --git a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js
index 2fbeaaf84..7052610ac 100644
--- a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js
+++ b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js
@@ -38,7 +38,7 @@ class FileBrowserModalContent extends Component {
   constructor(props, context) {
     super(props, context);
 
-    this._scrollerNode = null;
+    this._scrollerRef = React.createRef();
 
     this.state = {
       isFileBrowserModalOpen: false,
@@ -56,21 +56,10 @@ class FileBrowserModalContent extends Component {
       currentPath !== prevState.currentPath
     ) {
       this.setState({ currentPath });
-      this._scrollerNode.scrollTop = 0;
+      this._scrollerRef.current.scrollTop = 0;
     }
   }
 
-  //
-  // Control
-
-  setScrollerRef = (ref) => {
-    if (ref) {
-      this._scrollerNode = ReactDOM.findDOMNode(ref);
-    } else {
-      this._scrollerNode = null;
-    }
-  };
-
   //
   // Listeners
 
@@ -142,7 +131,7 @@ class FileBrowserModalContent extends Component {
           />
 
           <Scroller
-            ref={this.setScrollerRef}
+            ref={this._scrollerRef}
             className={styles.scroller}
             scrollDirection={scrollDirections.BOTH}
           >