diff --git a/components/ideintf/graphpropedits.pas b/components/ideintf/graphpropedits.pas
index 1fb821a517..54a7d0fd63 100644
--- a/components/ideintf/graphpropedits.pas
+++ b/components/ideintf/graphpropedits.pas
@@ -443,6 +443,7 @@ procedure TFontNamePropertyEditor.GetValues(Proc: TGetStrProc);
 var
   I: Integer;
 begin
+  Proc('default');
   for I := 0 to Screen.Fonts.Count -1 do
     Proc(Screen.Fonts[I]);
 end;
diff --git a/lcl/include/scrollingwincontrol.inc b/lcl/include/scrollingwincontrol.inc
index 47deefe5d0..8944fec2d2 100644
--- a/lcl/include/scrollingwincontrol.inc
+++ b/lcl/include/scrollingwincontrol.inc
@@ -213,7 +213,7 @@ end;
 
 procedure TScrollingWinControl.UpdateScrollbars;
 begin
-  if ([csLoading, csDestroying] * ComponentState <> []) then Exit;
+  if ([csLoading, csDestroying, csDesigning] * ComponentState <> []) then Exit;
   if not HandleAllocated then Exit;
   if (HorzScrollBar = nil) or (VertScrollBar = nil) then Exit;