diff --git a/frontend/src/app/components/wp-table/configuration-modal/tabs/highlighting-tab.component.html b/frontend/src/app/components/wp-table/configuration-modal/tabs/highlighting-tab.component.html
index d375b6f403..89a6630c98 100644
--- a/frontend/src/app/components/wp-table/configuration-modal/tabs/highlighting-tab.component.html
+++ b/frontend/src/app/components/wp-table/configuration-modal/tabs/highlighting-tab.component.html
@@ -7,73 +7,78 @@
   </enterprise-banner>
   <form>
     <p [textContent]="text.highlighting_mode.description"></p>
-    <div class="form--field -full-width">
+    <div class="form--field">
+      <label class="form--label">
+        <input type="radio"
+               [attr.disabled]="disabledValue(eeShowBanners)"
+               [(ngModel)]="highlightingMode"
+               (change)="updateMode($event.target.value)"
+               value="inline"
+               name="highlighting_mode_switch">
+        <span [textContent]="text.highlighting_mode.inline"></span>&nbsp;
+      </label>
+      
       <div class="form--field-container">
-        <label class="option-label -multi-line">
-          <input type="radio"
-                 [attr.disabled]="disabledValue(eeShowBanners)"
-                 [(ngModel)]="highlightingMode"
-                 (change)="updateMode($event.target.value)"
-                 value="inline"
-                 name="highlighting_mode_switch">
-          <span [textContent]="text.highlighting_mode.inline"></span>&nbsp;
-        </label>
-
-        <ng-select #highlightedAttributesNgSelect
-                   [items]="availableInlineHighlightedAttributes"
-                   [(ngModel)]="selectedAttributes"
-                   [multiple]="true"
-                   [disabled]="highlightingMode !== 'inline'"
-                   [clearable]="false"
-                   [closeOnSelect]="false"
-                   (open)="onOpen(highlightedAttributesNgSelect)"
-                   (change)="updateHighlightingAttributes($event)"
-                   class="-multi-select"
-                   bindLabel="name"
-                   name="highlighting_attributes"
-                   appendTo="body">
-        </ng-select>
+        <div class="form--select-container">
+          <ng-select #highlightedAttributesNgSelect
+                     [items]="availableInlineHighlightedAttributes"
+                     [(ngModel)]="selectedAttributes"
+                     [multiple]="true"
+                     [disabled]="highlightingMode !== 'inline'"
+                     [clearable]="false"
+                     [closeOnSelect]="false"
+                     (open)="onOpen(highlightedAttributesNgSelect)"
+                     (change)="updateHighlightingAttributes($event)"
+                     class="form--select-field -multi-select"
+                     bindLabel="name"
+                     name="highlighting_attributes"
+                     appendTo="body">
+          </ng-select>
+        </div>
       </div>
     </div>
-    <div class="form--field -full-width">
-      <div class="form--field-container">
-        <label class="option-label">
-          <input type="radio"
-                 [attr.disabled]="disabledValue(eeShowBanners)"
-                 [(ngModel)]="entireRowMode"
-                 (change)="updateMode('entire-row')"
-                 [value]="true"
-                 name="entire_row_switch">
-          <span [textContent]="text.highlighting_mode.entire_row_by"></span>
-        </label>
 
-        <ng-select #rowHighlightNgSelect
-                   [items]="availableRowHighlightedAttributes"
-                   [(ngModel)]="lastEntireRowAttribute"
-                   [disabled]="disabledValue(eeShowBanners)"
-                   [clearable]="false"
-                   (open)="onOpen(rowHighlightNgSelect)"
-                   (change)="updateMode($event.value)"
-                   bindLabel="name"
-                   bindValue="value"
-                   name="selected_attribute"
-                   appendTo="body"
-                   id="selected_attribute">
-        </ng-select>
-      </div>
-    </div>
-    <div class="form--field -full-width">
+    <div class="form--field">
+      <label class="form--label">
+        <input type="radio"
+               [attr.disabled]="disabledValue(eeShowBanners)"
+               [(ngModel)]="entireRowMode"
+               (change)="updateMode('entire-row')"
+               [value]="true"
+               name="entire_row_switch">
+        <span [textContent]="text.highlighting_mode.entire_row_by"></span>
+      </label>
+
       <div class="form--field-container">
-        <label class="option-label">
-          <input type="radio"
-                 [attr.disabled]="disabledValue(eeShowBanners)"
-                 [(ngModel)]="highlightingMode"
-                 (change)="updateMode($event.target.value)"
-                 value="none"
-                 name="highlighting_mode_switch">
-          <span [textContent]="text.highlighting_mode.none"></span>
-        </label>
+        <div class="form--select-container">
+          <ng-select #rowHighlightNgSelect
+                     [items]="availableRowHighlightedAttributes"
+                     [(ngModel)]="lastEntireRowAttribute"
+                     [disabled]="disabledValue(eeShowBanners)"
+                     [clearable]="false"
+                     (open)="onOpen(rowHighlightNgSelect)"
+                     (change)="updateMode($event.value)"
+                     bindLabel="name"
+                     bindValue="value"
+                     name="selected_attribute"
+                     appendTo="body"
+                     id="selected_attribute"
+                     class="form--select-field">
+          </ng-select>
+        </div>
       </div>
     </div>
+
+    <div class="form--field">
+      <label class="form--label">
+        <input type="radio"
+               [attr.disabled]="disabledValue(eeShowBanners)"
+               [(ngModel)]="highlightingMode"
+               (change)="updateMode($event.target.value)"
+               value="none"
+               name="highlighting_mode_switch">
+        <span [textContent]="text.highlighting_mode.none"></span>
+      </label>
+    </div>
   </form>
 </div>