diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb
index 2cbf812..5d88327 100644
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@@ -597,10 +597,9 @@ Public Class frmValidator
     Sub Load_Controls()
         Try
             pnldesigner.Controls.Clear()
-            'Dim dt As DataTable = DD_DMSLiteDataSet.VWPM_CONTROL_INDEX
-            Dim oSQL = $"SELECT * FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {CURRENT_ProfilGUID}"
-            DTCONTROLS = ClassDatabase.Return_Datatable(oSQL)
 
+            Dim oSQL = $"SELECT * FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY Y_LOC, X_LOC"
+            DTCONTROLS = ClassDatabase.Return_Datatable(oSQL)
 
             Dim oCount As Integer = 0
 
@@ -821,12 +820,13 @@ Public Class frmValidator
                         first_control = oMyControl
                     End If
                     last_control = oMyControl
-                End If
 
+                    oMyControl.TabIndex = oCount
+                End If
 
                 pnldesigner.Controls.Add(oMyControl)
 
-                'LoadSimpleData(ctrl, oControlRow.Item("GUID"))
+                oCount += 1
             Next
             LOGGER.Debug("Controls geladen")
             LOGGER.Info("")
@@ -839,7 +839,6 @@ Public Class frmValidator
             LOGGER.Info("")
 
         End Try
-
     End Sub
 
     Sub Clear_all_Input()