diff --git a/components/exctrls/examples/QuestionDlgEx/main.pas b/components/exctrls/examples/QuestionDlgEx/main.pas
index 1810b667d..33f9d114b 100644
--- a/components/exctrls/examples/QuestionDlgEx/main.pas
+++ b/components/exctrls/examples/QuestionDlgEx/main.pas
@@ -66,7 +66,7 @@ implementation
 {$R *.lfm}
 
 uses
-  LCLIntf, LCLType, InterfaceBase, TypInfo, 
+  LCLIntf, LCLType, InterfaceBase, TypInfo, Math, 
   {$IF FPC_FullVersion >= 30202}System.{$IFEND}UITypes;
 
 const
@@ -283,7 +283,7 @@ end;
 procedure TDemoForm.FormCreate(Sender: TObject);
 begin
   cbFontName.Items.Assign(Screen.Fonts);
-  cbFontName.ItemIndex := cbFontName.Items.IndexOf('Consolas');;
+  cbFontName.ItemIndex := Max(0, cbFontName.Items.IndexOf('Liberation Sans'));
   cbFontName.Enabled := false;
   seFontSize.Enabled := false;
   lblResult.Caption := '';
diff --git a/components/exctrls/source/exquestiondlg.pas b/components/exctrls/source/exquestiondlg.pas
index bb0d5ff7a..e9779ac77 100644
--- a/components/exctrls/source/exquestiondlg.pas
+++ b/components/exctrls/source/exquestiondlg.pas
@@ -128,7 +128,7 @@ type
 constructor TQForm.CreateNew(AOwner: TComponent; Num: Integer = 0);
 begin
   inherited;
-  BorderStyle := bsDialog;
+  BorderStyle := bsSingle;  // In gth2, bsDialog "glues" the dialog to the calling form
   BorderIcons := [biSystemMenu];
   Color := clWindow;
   PopupMode := pmAuto;