diff --git a/src/common/Popup/Menu.js b/src/common/Popup/Menu.js
index 3de5df137..2c0ff4637 100644
--- a/src/common/Popup/Menu.js
+++ b/src/common/Popup/Menu.js
@@ -1,7 +1,9 @@
 import React from 'react';
 
-const Menu = ({ children }) => {
-    return React.Children.only(children);
-};
+const Menu = React.forwardRef(({ children }, ref) => (
+    <div ref={ref}>
+        {children}
+    </div>
+));
 
 export default Menu;
diff --git a/src/common/Popup/Popup.js b/src/common/Popup/Popup.js
index 6ad80d7bb..f7ad1dd71 100644
--- a/src/common/Popup/Popup.js
+++ b/src/common/Popup/Popup.js
@@ -228,9 +228,7 @@ class Popup extends Component {
             <Modal className={classnames('modal-container', this.props.className)} onClick={this.close}>
                 <div ref={this.menuContainerRef} className={styles['menu-container']} onClick={this.menuContainerOnClick}>
                     <div ref={this.menuScrollRef} className={styles['menu-scroll-container']}>
-                        <div ref={this.menuChildrenRef}>
-                            {children}
-                        </div>
+                        {React.cloneElement(children, { ref: this.menuChildrenRef })}
                     </div>
                     <div ref={this.menuBorderTopRef} className={classnames(styles['border'], styles['border-top'])} />
                     <div ref={this.menuBorderRightRef} className={classnames(styles['border'], styles['border-right'])} />