diff --git a/src/common/Popup/Menu.js b/src/common/Popup/Menu.js
index 96fefccb6..01317d24d 100644
--- a/src/common/Popup/Menu.js
+++ b/src/common/Popup/Menu.js
@@ -1,11 +1,6 @@
-const React = require('react');
 const PropTypes = require('prop-types');
 
-const Menu = React.forwardRef(({ children }, ref) => (
-    <div ref={ref}>
-        {children}
-    </div>
-));
+const Menu = ({ children }) => children;
 
 Menu.displayName = 'Popup.Menu';
 
diff --git a/src/common/Popup/Popup.js b/src/common/Popup/Popup.js
index 2ef6ffcc4..4230eb72c 100644
--- a/src/common/Popup/Popup.js
+++ b/src/common/Popup/Popup.js
@@ -228,21 +228,23 @@ class Popup extends React.Component {
         this.close();
     }
 
-    renderLabel(children) {
-        return React.cloneElement(children, { ref: this.labelRef, onClick: this.labelOnClick });
+    renderLabel(labelElement) {
+        return React.cloneElement(labelElement, { ref: this.labelRef, onClick: this.labelOnClick });
     }
 
-    renderMenu(children) {
+    renderMenu(menuElement) {
         if (!this.state.open) {
-            return null;
+            return React.cloneElement(menuElement, {}, null);
         }
 
-        return (
+        return React.cloneElement(menuElement, {},
             <Modal>
                 <div className={classnames(styles['modal-container'], this.props.modalContainerClassName)} onClick={this.modalBackgroundOnClick}>
                     <div ref={this.menuContainerRef} className={styles['menu-container']} onClick={this.menuContainerOnClick}>
                         <div ref={this.menuScrollRef} className={styles['menu-scroll-container']}>
-                            {React.cloneElement(children, { ref: this.menuChildrenRef })}
+                            <div ref={this.menuChildrenRef}>
+                                {menuElement.props.children}
+                            </div>
                         </div>
                         <div ref={this.menuBorderTopRef} className={classnames(styles['border'], styles['border-top'])} />
                         <div ref={this.menuBorderRightRef} className={classnames(styles['border'], styles['border-right'])} />