diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
index eacb5ad7d..9b857cc7d 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
@@ -13,16 +13,15 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-
-<mat-drawer-container
-  class="risk-assessment-container"
-  *ngIf="viewModel$ | async as vm">
-  <mat-drawer-content class="risk-assessment-content">
-    <mat-toolbar class="risk-assessment-toolbar">
-      <h2 class="title">Risk assessment</h2>
-    </mat-toolbar>
-    <div class="main-content"></div>
-  </mat-drawer-content>
+<ng-container *ngIf="viewModel$ | async as vm">
+  <mat-drawer-container class="risk-assessment-container">
+    <mat-drawer-content class="risk-assessment-content">
+      <mat-toolbar class="risk-assessment-toolbar">
+        <h2 class="title">Risk assessment</h2>
+      </mat-toolbar>
+      <div class="main-content"></div>
+    </mat-drawer-content>
+  </mat-drawer-container>
   <mat-drawer
     mode="side"
     opened
@@ -37,4 +36,4 @@ <h2 class="profiles-drawer-header-title">Saved profiles</h2>
       </app-profile-item>
     </div>
   </mat-drawer>
-</mat-drawer-container>
+</ng-container>
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 82554f70a..b77320ba3 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
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 @import 'src/theming/colors';
+@import 'src/theming/variables';
 
 .risk-assessment-container,
 .risk-assessment-content {
@@ -38,7 +39,7 @@
 }
 
 .profiles-drawer {
-  width: 320px;
+  width: $profiles-drawer-width;
   box-shadow: none;
   border-left: 1px solid $light-grey;
 }
diff --git a/modules/ui/src/styles.scss b/modules/ui/src/styles.scss
index cce2334be..db5fb9377 100644
--- a/modules/ui/src/styles.scss
+++ b/modules/ui/src/styles.scss
@@ -15,6 +15,7 @@
  */
 @use '@angular/material' as mat;
 @import './theming/theme';
+@import 'src/theming/variables';
 
 html,
 body {
@@ -234,6 +235,10 @@ body
 body
   #main:has(app-callout .info):not(:has(app-callout .error))
   app-progress:not(:has(.progress-content-empty)),
+body
+  #main:has(app-callout .info):not(:has(app-callout .error))
+  app-risk-assessment
+  .risk-assessment-container,
 body
   #main:has(app-callout .error):not(:has(app-callout .info))
   app-device-repository:not(:has(.device-repository-content-empty)),
@@ -242,7 +247,11 @@ body
   app-history:not(:has(.results-content-empty)),
 body
   #main:has(app-callout .error):not(:has(app-callout .info))
-  app-progress:not(:has(.progress-content-empty)) {
+  app-progress:not(:has(.progress-content-empty)),
+body
+  #main:has(app-callout .error):not(:has(app-callout .info))
+  app-risk-assessment
+  .risk-assessment-container {
   margin-top: 96px;
 }
 
@@ -254,10 +263,18 @@ body
   app-history:not(:has(.results-content-empty)),
 body
   #main:has(app-callout .info):has(app-callout .error)
-  app-progress:not(:has(.progress-content-empty)) {
+  app-progress:not(:has(.progress-content-empty)),
+body
+  #main:has(app-callout .info):has(app-callout .error)
+  app-risk-assessment
+  .risk-assessment-container {
   margin-top: 156px;
 }
 
+body:has(app-risk-assessment .profiles-drawer) #main app-callout {
+  width: calc(100% - $profiles-drawer-width);
+}
+
 .text-nowrap {
   white-space: nowrap;
 }
diff --git a/modules/ui/src/theming/variables.scss b/modules/ui/src/theming/variables.scss
index 3d5e9e53c..f14f21652 100644
--- a/modules/ui/src/theming/variables.scss
+++ b/modules/ui/src/theming/variables.scss
@@ -14,5 +14,6 @@
  * limitations under the License.
  */
 $device-item-width: 352px;
+$profiles-drawer-width: 320px;
 
 $font-secondary: 'Roboto';