diff --git a/css/80_app.css b/css/80_app.css
index 2cb6d3d46c..118232e873 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -4988,10 +4988,10 @@ img.tile-debug {
     flex-direction: column;
 }
 
-.modal .content {
+/* .modal .content {
     overflow-x: hidden;
     overflow-y: auto;
-}
+} */
 
 .modal .loader {
     margin-bottom: 10px;
@@ -5030,6 +5030,12 @@ img.tile-debug {
     text-align: center;
 }
 
+.content-wrapper {
+    overflow-x: hidden;
+    overflow-y: auto;
+    max-height: calc(90vh - 100px);
+}
+
 .modal-section.buttons button {
     min-width: 130px;
 }
diff --git a/modules/ui/confirm.js b/modules/ui/confirm.js
index 381aa475e3..4badfb47a1 100644
--- a/modules/ui/confirm.js
+++ b/modules/ui/confirm.js
@@ -13,10 +13,14 @@ export function uiConfirm(selection) {
     section.append('div')
         .attr('class', 'modal-section header');
 
-    section.append('div')
+    // Wrapper for message-text and buttons
+    var contentWrapper = section.append('div')
+    .attr('class', 'content-wrapper');
+
+    contentWrapper.append('div')
         .attr('class', 'modal-section message-text');
 
-    var buttons = section.append('div')
+    var buttons = contentWrapper.append('div')
         .attr('class', 'modal-section buttons cf');
 
 
diff --git a/modules/ui/shortcuts.js b/modules/ui/shortcuts.js
index eab2be45ca..ea0a43eb29 100644
--- a/modules/ui/shortcuts.js
+++ b/modules/ui/shortcuts.js
@@ -29,10 +29,14 @@ export function uiShortcuts(context) {
             .append('h2')
             .call(t.append('shortcuts.title'));
 
+        // Wrapper for grouping shortcuts list and buttons under content-wrapper
+        var wrapper = content.append('div')
+            .attr('class', 'content-wrapper modal-section');
+
         fileFetcher.get('shortcuts')
             .then(function(data) {
                 _dataShortcuts = data;
-                content.call(render);
+                wrapper.call(render);
             })
             .catch(function() { /* ignore */ });
     }