diff --git a/src/frontend/app/administration/customField/custom-fields-administration.component.html b/src/frontend/app/administration/customField/custom-fields-administration.component.html
index 5528df36807da6209ac6d56b9c931ec30479e59f..f9f02ce70227562ce09922e7c3bf8e1fe6169f50 100644
--- a/src/frontend/app/administration/customField/custom-fields-administration.component.html
+++ b/src/frontend/app/administration/customField/custom-fields-administration.component.html
@@ -44,6 +44,12 @@
                                         </mat-form-field>
                                     </div>
                                     <div class="col-md-12" style="display: flex;align-items: center;">
+                                        <div>
+                                            <button *ngIf="!custom.SQLMode && 'banAutocomplete' !== custom.type"
+                                                mat-mini-fab color="primary" (click)="switchSQLMode(custom)">
+                                                <mat-icon class="fas fa-database" style="height: auto;"></mat-icon>
+                                            </button>
+                                        </div>
                                         <div style="flex:1;"
                                             *ngIf="['select', 'radio', 'checkbox'].indexOf(custom.type) > -1">
                                             <mat-expansion-panel *ngIf="!custom.SQLMode" class="customFieldValues"
@@ -82,15 +88,14 @@
                                                 </div>
                                             </mat-expansion-panel>
                                         </div>
-                                        <div>
-                                            <button *ngIf="!custom.SQLMode && 'banAutocomplete' !== custom.type"
-                                                mat-mini-fab color="primary" (click)="switchSQLMode(custom)">
-                                                <mat-icon class="fas fa-database" style="height: auto;"></mat-icon>
-                                            </button>
-                                        </div>
                                     </div>
                                     <div *ngIf="custom.SQLMode" class="col-md-12"
                                         style="display: flex;align-items: center;">
+                                        <div>
+                                            <button mat-mini-fab color="primary" (click)="switchSQLMode(custom)">
+                                                <mat-icon class="fas fa-list-ol" style="height: auto;"></mat-icon>
+                                            </button>
+                                        </div>
                                         <div style="flex:1;">
                                             <mat-expansion-panel *ngIf="custom.SQLMode" class="customFieldValues"
                                                 opened>
@@ -154,11 +159,6 @@
                                                 </div>
                                             </mat-expansion-panel>
                                         </div>
-                                        <div>
-                                            <button mat-mini-fab color="primary" (click)="switchSQLMode(custom)">
-                                                <mat-icon class="fas fa-list-ol" style="height: auto;"></mat-icon>
-                                            </button>
-                                        </div>
                                     </div>
                                     <div class="col-md-12 text-center">
                                         <button mat-raised-button color="primary"