diff --git a/js/src/modals/PasswordManager/passwordManager.css b/js/src/modals/PasswordManager/passwordManager.css
index aa0f72cb3..f538ef546 100644
--- a/js/src/modals/PasswordManager/passwordManager.css
+++ b/js/src/modals/PasswordManager/passwordManager.css
@@ -46,6 +46,16 @@
   font-size: 1.1rem;
 }
 
+.passwords {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.password {
+  flex: 0 1 50%;
+  width: 50%;
+}
+
 .passwordHint {
   font-size: 0.9rem;
   color: lightgrey;
diff --git a/js/src/modals/PasswordManager/passwordManager.js b/js/src/modals/PasswordManager/passwordManager.js
index 800fba929..368664a71 100644
--- a/js/src/modals/PasswordManager/passwordManager.js
+++ b/js/src/modals/PasswordManager/passwordManager.js
@@ -181,33 +181,37 @@ export default class PasswordManager extends Component {
                 disabled={ disabled }
                 onSubmit={ this.handleChangePassword }
                 onChange={ this.onEditCurrent } />
-
               <Input
-                label='new password'
-                hint='the new password for this account'
-                type='password'
-                submitOnBlur={ false }
-                disabled={ disabled }
-                onSubmit={ this.handleChangePassword }
-                onChange={ this.onEditNew } />
-              <Input
-                label='repeat new password'
-                hint='repeat the new password for this account'
-                type='password'
-                submitOnBlur={ false }
-                error={ repeatError }
-                disabled={ disabled }
-                onSubmit={ this.handleChangePassword }
-                onChange={ this.onEditRepeatNew } />
-
-              <Input
-                label='new password hint'
+                label='(optional) new password hint'
                 hint='hint for the new password'
                 submitOnBlur={ false }
                 value={ passwordHint }
                 disabled={ disabled }
                 onSubmit={ this.handleChangePassword }
                 onChange={ this.onEditHint } />
+              <div className={ styles.passwords }>
+                <div className={ styles.password }>
+                  <Input
+                    label='new password'
+                    hint='the new password for this account'
+                    type='password'
+                    submitOnBlur={ false }
+                    disabled={ disabled }
+                    onSubmit={ this.handleChangePassword }
+                    onChange={ this.onEditNew } />
+                </div>
+                <div className={ styles.password }>
+                  <Input
+                    label='repeat new password'
+                    hint='repeat the new password for this account'
+                    type='password'
+                    submitOnBlur={ false }
+                    error={ repeatError }
+                    disabled={ disabled }
+                    onSubmit={ this.handleChangePassword }
+                    onChange={ this.onEditRepeatNew } />
+                </div>
+              </div>
             </div>
           </Form>
         </Tab>