diff --git a/ui-ngx/src/app/modules/home/components/vc/repository-settings.component.html b/ui-ngx/src/app/modules/home/components/vc/repository-settings.component.html
index 08038ede7f..b6fd7ad214 100644
--- a/ui-ngx/src/app/modules/home/components/vc/repository-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/vc/repository-settings.component.html
@@ -15,8 +15,10 @@
     limitations under the License.
 
 -->
-<div>
-  <mat-card appearance="outlined" class="repository-settings" [ngClass]="{'settings-card': !detailsMode}" [ngStyle]="popoverComponent ? {boxShadow: 'none', width: '800px'} : {}">
+<div style="height: min-content; max-height: 80vh;">
+  <mat-card appearance="outlined" class="repository-settings"
+            [ngClass]="{'settings-card': !detailsMode}"
+            [ngStyle]="popoverComponent ? {boxShadow: 'none', maxWidth: '100%', minWidth: '100%', width: '800px'} : {}">
     <mat-card-header>
       <mat-card-title>
         <span class="mat-headline-5" translate>admin.repository-settings</span>
diff --git a/ui-ngx/src/styles.scss b/ui-ngx/src/styles.scss
index 30bb7517e5..64342a686a 100644
--- a/ui-ngx/src/styles.scss
+++ b/ui-ngx/src/styles.scss
@@ -164,6 +164,10 @@ fieldset {
   border: none;
 }
 
+.fields-group {
+  display: grid;
+}
+
 section.tb-header-buttons {
   position: absolute;
   top: 86px;
@@ -1486,8 +1490,7 @@ mat-label {
   }
 
   @media #{$mat-lt-md} {
-    .mat-mdc-form-field.mat-mdc-form-field-has-icon-suffix,
-    .mat-mdc-form-field.mat-mdc-form-field-has-icon-prefix{
+    .mat-mdc-form-field {
       .mat-mdc-form-field-infix {
         width: auto;
       }