diff --git a/app/src/gambas3/.src/Help/HelpView.class b/app/src/gambas3/.src/Help/HelpView.class
index bdc2d26af..e9fc5fb86 100644
--- a/app/src/gambas3/.src/Help/HelpView.class
+++ b/app/src/gambas3/.src/Help/HelpView.class
@@ -115,9 +115,14 @@ Private Sub Url_Write(Value As String)
 
 End
 
-Public Sub Back()
+Public Sub Back() As Boolean
   
-  $hView.Back
+  If $hView Is WebView Then
+    If Not $hView.History.CanGoBack Then Return True
+    $hView.Back()
+  Else
+    Return $hView.Back()
+  Endif
   
 End
 
@@ -157,3 +162,8 @@ Public Sub ZoomNormal()
   
 End
 
+Public Sub Clear()
+  
+  $hView.Clear()
+  
+End
diff --git a/app/src/gambas3/.src/Project/Component/FComponentChooser.class b/app/src/gambas3/.src/Project/Component/FComponentChooser.class
index 3da71f220..d825f1282 100644
--- a/app/src/gambas3/.src/Project/Component/FComponentChooser.class
+++ b/app/src/gambas3/.src/Project/Component/FComponentChooser.class
@@ -169,11 +169,7 @@ End
 
 Public Sub btnBack_Click()
 
-  If webAboutComponent.History.CanGoBack Then
-    webAboutComponent.Back
-  Else
-    'webAboutComponent.Stop
-    webAboutComponent.Clear
+  If webAboutComponent.Back() Then
     wizComponent.MovePrevious
   Endif
   
@@ -476,6 +472,7 @@ Public Sub gvwComponent_Click()
   Else If gvwComponent.Column = 4 And If Project.Documentation.Exist(sComp) Then
     
     webAboutComponent.ReadConfig
+    webAboutComponent.Clear
     MHelp.InitWebViewWith(webAboutComponent, MHelp.TYPE_COMPONENT, GetCurrent(),, "v&nh")
     webAboutComponent.Zoom = Settings["/Help/Zoom", 80] / 100
     wizComponent.MoveNext