diff --git a/src/common/Modal/Modal.js b/src/common/Modal/Modal.js
index 7c99843d4..22bef8d82 100644
--- a/src/common/Modal/Modal.js
+++ b/src/common/Modal/Modal.js
@@ -1,10 +1,11 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
+import classnames from 'classnames';
 import { FocusableProvider } from 'stremio-common';
 
 const Modal = (props) => ReactDOM.createPortal(
     <FocusableProvider>
-        <div {...props} />
+        <div {...props} className={classnames(Modal.className, props.className)} />
     </FocusableProvider>,
     Modal.container
 );
diff --git a/src/common/Popup/Popup.js b/src/common/Popup/Popup.js
index f7ad1dd71..bf6bbf2e9 100644
--- a/src/common/Popup/Popup.js
+++ b/src/common/Popup/Popup.js
@@ -225,7 +225,7 @@ class Popup extends Component {
         }
 
         return (
-            <Modal className={classnames('modal-container', this.props.className)} onClick={this.close}>
+            <Modal className={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']}>
                         {React.cloneElement(children, { ref: this.menuChildrenRef })}
diff --git a/src/index.js b/src/index.js
index 449489c8a..e35f006d6 100755
--- a/src/index.js
+++ b/src/index.js
@@ -6,5 +6,6 @@ import App from './app';
 const container = document.getElementById('app');
 
 Modal.container = container;
+Modal.className = 'modal-container';
 
 ReactDOM.render(<App />, container);