diff --git a/modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.scss b/modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.scss
index d9e90a2c4..7cc73b3fc 100644
--- a/modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.scss
+++ b/modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.scss
@@ -17,7 +17,14 @@
 @import 'src/theming/colors';
 @import 'src/theming/variables';
 
+:host {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
 .profile-form {
+  overflow: scroll;
   .field-container {
     display: flex;
     flex-direction: column;
diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.scss b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.scss
index c4ef49782..c7241c6c4 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.scss
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.scss
@@ -61,7 +61,7 @@
 
 .main-content {
   padding: 16px 32px;
-  overflow: scroll;
+  overflow: hidden;
   width: calc(100% - $profiles-drawer-width);
 }