diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb
index d1f2643..72ceda5 100644
--- a/app/DD_PM_WINDREAM/ClassControlCreator.vb
+++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb
@@ -608,6 +608,7 @@ Public Class ClassControlCreator
                                                      End If
                                                  Next
                                              Next
+
                                          Catch ex As Exception
                                              Logger.Error(ex)
                                          Finally
@@ -658,6 +659,9 @@ Public Class ClassControlCreator
                                            oView2.UpdateCurrentRow()
                                        End Sub
 
+        ' 08.11.2021: Fix editor being empty on first open
+        oView.FocusInvalidRow()
+
         Return oControl
     End Function
 
@@ -916,8 +920,7 @@ Public Class ClassControlCreator
                     If Not IsDBNull(oSqlStatement) And Not IsDBNull(oSqlStatement) Then
                         oSqlStatement = clsPatterns.ReplaceAllValues(oSqlStatement, pControlPanel, True)
 
-                        ClassControlCreator.GridTables_CacheDatatableForColumn(oControlId, oColumnName, oSqlStatement, oConnectionId, oAdvancedLookup)
-
+                        GridTables_CacheDatatableForColumn(oControlId, oColumnName, oSqlStatement, oConnectionId, oAdvancedLookup)
 
                         ' === Block to force setting the editor for GridColumns
                         For Each oControl As Control In pControlPanel.Controls