diff --git a/comp/src/gb.gui.base/.src/GridView/GridView.class b/comp/src/gb.gui.base/.src/GridView/GridView.class
index 784ad4b22..f8a4b7cc1 100644
--- a/comp/src/gb.gui.base/.src/GridView/GridView.class
+++ b/comp/src/gb.gui.base/.src/GridView/GridView.class
@@ -2077,7 +2077,7 @@ Public Sub _GetPreferredWidth(iCol As Integer) As Integer
   Dim bBusy As Boolean
   Dim J As Integer
   
-  PW = Me.Font.TextWidth($hColumns[iCol].Text) + $iPadding * 2 + If($bSorted, 16, 0)
+  PW = Me.Font.TextWidth($hColumns[iCol].Text) + Max(Desktop.Scale \ 2, $iPadding) * 2 + If($bSorted, 16, 0) + 2
   
   fTime = Timer
   
diff --git a/comp/src/gb.gui.base/.src/_Gui.class b/comp/src/gb.gui.base/.src/_Gui.class
index 5bd476e70..01147f4d7 100644
--- a/comp/src/gb.gui.base/.src/_Gui.class
+++ b/comp/src/gb.gui.base/.src/_Gui.class
@@ -107,6 +107,7 @@ Static Public Sub _InitMenuBarShortcut(hWindow As Window)
 
   For Each hMenu In hWindow.Menus
     
+    If Not Object.IsValid(hMenu) Then Continue
     If Not hMenu.Text Then Continue
     
     If bVisible Then