From b4c2840731063909f930073ec6d58da840b642cc Mon Sep 17 00:00:00 2001
From: sagar-joshi <sagar.00joshi@gmail.com>
Date: Wed, 28 Oct 2020 14:29:42 +0530
Subject: [PATCH 1/3] add overflow-y: scroll to .overlay_body in _overlay.scss

---
 client/styles/components/_overlay.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/styles/components/_overlay.scss b/client/styles/components/_overlay.scss
index 3e0efbadeb..fcf9e9ecc5 100644
--- a/client/styles/components/_overlay.scss
+++ b/client/styles/components/_overlay.scss
@@ -25,6 +25,7 @@
   max-height: 80%;
   max-width: 65%;
   position: relative;
+  overflow-y: scroll;
 }
 
 .overlay__header {

From be906c75d53316738b5bdeee90c2e813309dbc1a Mon Sep 17 00:00:00 2001
From: Cassie Tarakajian <ctarakajian@gmail.com>
Date: Wed, 28 Oct 2020 16:47:47 -0400
Subject: [PATCH 2/3] [#1654] Scroll content in overlay rather than header and
 content

---
 client/styles/components/_keyboard-shortcuts.scss |  1 +
 client/styles/components/_overlay.scss            |  1 -
 client/styles/components/_preferences.scss        | 11 ++++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/client/styles/components/_keyboard-shortcuts.scss b/client/styles/components/_keyboard-shortcuts.scss
index ca6f81fd74..6530af5558 100644
--- a/client/styles/components/_keyboard-shortcuts.scss
+++ b/client/styles/components/_keyboard-shortcuts.scss
@@ -2,6 +2,7 @@
   padding: #{20 / $base-font-size}rem;
   padding-bottom: #{40 / $base-font-size}rem;
   width: #{450 / $base-font-size}rem;
+  overflow-y: scroll;
 }
 
 .keyboard-shortcuts-note {
diff --git a/client/styles/components/_overlay.scss b/client/styles/components/_overlay.scss
index fcf9e9ecc5..3e0efbadeb 100644
--- a/client/styles/components/_overlay.scss
+++ b/client/styles/components/_overlay.scss
@@ -25,7 +25,6 @@
   max-height: 80%;
   max-width: 65%;
   position: relative;
-  overflow-y: scroll;
 }
 
 .overlay__header {
diff --git a/client/styles/components/_preferences.scss b/client/styles/components/_preferences.scss
index eb3d00b323..f34b920aba 100644
--- a/client/styles/components/_preferences.scss
+++ b/client/styles/components/_preferences.scss
@@ -2,7 +2,6 @@
   width: 100%;
   width: #{640 / $base-font-size}rem;
   max-width: 100%;
-  min-height: #{460 / $base-font-size}rem;
   max-height: 100%;
   z-index: 9999;
   padding: 0 #{20 / $base-font-size}rem #{2 / $base-font-size}rem #{20 /
@@ -10,6 +9,16 @@
   display: flex;
   flex-direction: column;
   outline: none;
+  height: calc(80vh - #{65 / $base-font-size}rem);
+  max-height: #{460 / $base-font-size}rem;
+  & .react-tabs {
+    max-height: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+  & .react-tabs__tab-panel {
+    overflow-y: scroll;
+  }
 }
 
 .preferences__exit-button {

From d71b937b57428c03030ebc208a7ab17274d2f078 Mon Sep 17 00:00:00 2001
From: sagar-joshi <sagar.00joshi@gmail.com>
Date: Thu, 29 Oct 2020 15:23:39 +0530
Subject: [PATCH 3/3] align scrollbar with close button in keyboard shortcuts

---
 client/styles/components/_keyboard-shortcuts.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/styles/components/_keyboard-shortcuts.scss b/client/styles/components/_keyboard-shortcuts.scss
index 6530af5558..9e223ba6a1 100644
--- a/client/styles/components/_keyboard-shortcuts.scss
+++ b/client/styles/components/_keyboard-shortcuts.scss
@@ -1,5 +1,6 @@
 .keyboard-shortcuts {
   padding: #{20 / $base-font-size}rem;
+  margin-right: #{20 / $base-font-size}rem;
   padding-bottom: #{40 / $base-font-size}rem;
   width: #{450 / $base-font-size}rem;
   overflow-y: scroll;