diff --git a/app/assets/stylesheets/content/_modal.sass b/app/assets/stylesheets/content/_modal.sass
index eb37660ef8..5e3ab33f09 100644
--- a/app/assets/stylesheets/content/_modal.sass
+++ b/app/assets/stylesheets/content/_modal.sass
@@ -55,13 +55,14 @@ $ng-modal-image-width: $ng-modal-image-height
 .op-modal--modal-container
   transition: opacity 0.25s ease
   background: $ng-modal-background
-  margin: auto
-  width: 50%
-  max-height: 95%
   position: relative
   padding: $ng-modal-padding / 2
+  width: fit-content
+  min-width: 200px
+  max-width: 40vw
   overflow-y: auto
-  overflow-x: hidden
+  
+  @include styled-scroll-bar-vertical
 
   &.-wide
     min-width: 75vw
@@ -143,14 +144,15 @@ $ng-modal-image-width: $ng-modal-image-height
 
 // Specific styles for export-modal
 ul.export-options
+  display: flex
+  flex-wrap: wrap
   margin: 0
   padding: 20px 0
   list-style-type: none
   li
-    margin: 0 0 30px 0
+    flex: 1 1 calc(33% - 40px)  // line break after third element
+    margin: 20px
     text-align: center
-    display: inline-block
-    width: 32%
     a
       cursor: pointer
       text-decoration: none
diff --git a/app/assets/stylesheets/content/work_packages/_table_configuration_modal.sass b/app/assets/stylesheets/content/work_packages/_table_configuration_modal.sass
index 1f1c8e9787..637dbda904 100644
--- a/app/assets/stylesheets/content/work_packages/_table_configuration_modal.sass
+++ b/app/assets/stylesheets/content/work_packages/_table_configuration_modal.sass
@@ -1,8 +1,6 @@
 .wp-table--configuration-modal
   min-height: 120px
   max-height: 90vh
-  width: 50vw
-  overflow-x: auto
 
   label.option-label
     float: left