diff --git a/src/common/Modal/Modal.js b/src/common/Modal/Modal.js
index 7dabafc80..6585149b8 100644
--- a/src/common/Modal/Modal.js
+++ b/src/common/Modal/Modal.js
@@ -11,9 +11,7 @@ const onModalsContainerDomTreeChange = ({ modalsContainerElement, contentElement
 const Modal = ({ modalsContainer, children }) => {
     return ReactDOM.createPortal(
         <FocusableProvider onModalsContainerDomTreeChange={onModalsContainerDomTreeChange}>
-            <div className={'modal-container'}>
-                {children}
-            </div>
+            <div>{children}</div>
         </FocusableProvider>,
         modalsContainer
     );
diff --git a/src/common/Popup/Popup.js b/src/common/Popup/Popup.js
index e02029595..b2d351ee2 100644
--- a/src/common/Popup/Popup.js
+++ b/src/common/Popup/Popup.js
@@ -237,7 +237,7 @@ class Popup extends Component {
 
         return (
             <Modal>
-                <div className={classnames(styles['modal-container'], this.props.className)} onClick={this.modalBackgroundOnClick}>
+                <div className={classnames(styles['modal-content-container'], this.props.className)} 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 })}
diff --git a/src/common/Popup/styles.less b/src/common/Popup/styles.less
index e70dbcb99..6de9aa29e 100644
--- a/src/common/Popup/styles.less
+++ b/src/common/Popup/styles.less
@@ -1,4 +1,4 @@
-.modal-container {
+.modal-content-container {
     width: 100%;
     height: 100%;
 
diff --git a/src/common/Router/Route/ModalsContainerProvider/styles.less b/src/common/Router/Route/ModalsContainerProvider/styles.less
index f0d7a65c7..18a629115 100644
--- a/src/common/Router/Route/ModalsContainerProvider/styles.less
+++ b/src/common/Router/Route/ModalsContainerProvider/styles.less
@@ -1,13 +1,13 @@
-  .modals-container {
-      width: 0;
-      height: 0;
+.modals-container {
+    width: 0;
+    height: 0;
 
-      >:global(.modal-container) {
-          position: absolute;
-          top: 0;
-          right: 0;
-          bottom: 0;
-          left: 0;
-          z-index: 1;
-      }
-  }
\ No newline at end of file
+    >* {
+        position: absolute;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        z-index: 1;
+    }
+}
\ No newline at end of file