1 files changed, 7 insertions, 5 deletions

diff --git a/wizards/source/webwizard/HtmlAutoPilotBasic.xba b/wizards/source/webwizard/HtmlAutoPilotBasic.xba
index dd2b713624d9..b474841a29b4 100644
--- a/wizards/source/webwizard/HtmlAutoPilotBasic.xba
+++ b/wizards/source/webwizard/HtmlAutoPilotBasic.xba
@@ -79,6 +79,7 @@ Sub Main
 	sBitmapPath = SOBitmapPath & "webwizard.bmp"
 	DialogModel.ImagePreview.ImageURL = sBitmapPath
 	ToggleOptionButtons(DialogModel, bWithBackGraphic)
+	MainDialog.GetControl("lbTemplate").SetFocus = True
 	DialogModel.cbGoOn.DefaultButton = True
 	MainDialog.Execute
 
@@ -104,7 +105,7 @@ Dim CurInd as Integer
 'On Local Error Goto ErrorOcurred
 ' Todo:Check if the pointer is really disabled, when set to Hourglass
 	ToggleDialogControls(False)
-	oBaseDocument.LockControllers
+'	oBaseDocument.LockControllers
 	' Get selected list entry and corresponding file name
 	CurInd = GetCurIndex(DialogModel.lbTemplate, Layout(), NumberofLayouts%, 2)
 	oCursor = oBaseDocument.Text.CreateTextCursor()
@@ -118,9 +119,9 @@ ErrorOcurred:
 	If Err <> 0 Then
 		MsgBox(WebWiz_gErrWhileReloading$, 16, WebWiz_gWizardName$)
 	End If
-	oBaseDocument.UnlockControllers
+'	oBaseDocument.UnlockControllers
 	oViewCursor.GotoStart(False)
-	ToggleDialogControls(True)
+	ToggleDialogControls(True, "lbTemplate")
 End Sub
 
 
@@ -146,7 +147,7 @@ Dim CurIndex as Integer
 	CheckControls(oBaseDocument.DrawPage)
 	oViewCursor.GotoStart(False)
 	oBaseDocument.UnlockControllers
-	ToggleDialogControls(True)
+	ToggleDialogControls(True, "lbStyles")
 End Sub
 
 
@@ -396,7 +397,7 @@ Dim sBitmapPath as String
 End Sub
 
 
-Sub ToggleDialogControls(ByVal bDoEnable as Boolean)
+Sub ToggleDialogControls(ByVal bDoEnable as Boolean, Optional FocusControlName as String)
 	With DialogModel
 		.cbCancel.Enabled = bDoEnable
 		.cbGoOn.Enabled = bDoEnable
@@ -409,6 +410,7 @@ Sub ToggleDialogControls(ByVal bDoEnable as Boolean)
 		If bDoEnable Then
 			' Enable Controls referring to Background graphic only when this Property is set
 			bDoEnable = bWithBackGraphic
+			MainDialog.GetControl(FocusControlName).SetFocus = True
 		End If
 		ToggleOptionButtons(DialogModel, bDoEnable)
 	End With