diff --git a/src/components/SettingsPage/PasswordModal.js b/src/components/SettingsPage/PasswordModal.js
index 1b8c3909..5acaf9cf 100644
--- a/src/components/SettingsPage/PasswordModal.js
+++ b/src/components/SettingsPage/PasswordModal.js
@@ -39,8 +39,7 @@ class PasswordModal extends PureComponent<Props, State> {
 
   componentWillReceiveProps(nextProps: Props) {
     if (!nextProps.isOpened) {
-      // CLean the state?
-      this.setState(prevState => ({ ...prevState, ...INITIAL_STATE }))
+      this.setState(INITIAL_STATE)
     }
   }
 
diff --git a/src/components/base/Modal/ModalContent.js b/src/components/base/Modal/ModalContent.js
index 7b74ddd1..84986fde 100644
--- a/src/components/base/Modal/ModalContent.js
+++ b/src/components/base/Modal/ModalContent.js
@@ -39,7 +39,7 @@ class ModalContent extends PureComponent<{
 
     const contentStyle = {
       ...CONTENT_STYLE,
-      overflow: noScroll ? 'visible' : 'auto',
+      overflow: noScroll ? 'visible' : 'inherit',
     }
 
     return (