diff --git a/desktop/app/src/chrome/SettingsSheet.tsx b/desktop/app/src/chrome/SettingsSheet.tsx
index 46146c8b1..3548701f2 100644
--- a/desktop/app/src/chrome/SettingsSheet.tsx
+++ b/desktop/app/src/chrome/SettingsSheet.tsx
@@ -104,8 +104,12 @@ class SettingsSheet extends Component<Props, State> {
         onCancel={this.props.onHide}
         width={570}
         title="Settings"
-        footer={footer}>
-        <FlexColumn>{contents}</FlexColumn>
+        footer={footer}
+        bodyStyle={{
+          overflow: 'scroll',
+          maxHeight: 'calc(100vh - 250px)',
+        }}>
+        {contents}
       </Modal>
     );
   }