diff --git a/app/src/gambas3/.src/Debug/FHelp.class b/app/src/gambas3/.src/Debug/FHelp.class
index edcba5c4a..89e0c8a91 100644
--- a/app/src/gambas3/.src/Debug/FHelp.class
+++ b/app/src/gambas3/.src/Debug/FHelp.class
@@ -8,12 +8,12 @@ Private Sub ShowHelp(hEditor As Editor)
     Me.Background = Color.LightBackground
     Me.Ignore = True
     Me.Reparent(hEditor.Parent)
-    Me.Height = Min(txtHelp.TextHeight + 10, Desktop.Height / 4)
+    Me.Height = Min(txtHelp.TextHeight + 15, Desktop.Height / 4)
     Me.Width = Desktop.Width / 3
-    iY = hEditor.Y + hEditor.CursorY + 5 + hEditor.LineHeight
+    iY = hEditor.Y + hEditor.CursorY + 20 + hEditor.LineHeight
     
     If (iY + Me.Height) > (hEditor.Y + hEditor.H) Then
-      iY = hEditor.Y + hEditor.CursorY - 5 - Me.Height
+      iY = hEditor.Y + hEditor.CursorY - 15 - Me.Height
     Endif
     hcont = hEditor.Parent
     iX = hEditor.CursorX
diff --git a/app/src/gambas3/.src/Editor/Code/FEditor.class b/app/src/gambas3/.src/Editor/Code/FEditor.class
index 80498347e..dc690a900 100644
--- a/app/src/gambas3/.src/Editor/Code/FEditor.class
+++ b/app/src/gambas3/.src/Editor/Code/FEditor.class
@@ -2221,29 +2221,28 @@ Private Sub FindDefinition(bPopupHelp As Boolean)
       Endif
 
       If bPopupHelp Then
-        MHelp.GotoKeyword(sKeyword, sKeyword2)
-      Else
         FHelp.ShowKeywordHelp(Editor, sKeyword, sKeyword2)
+      Else
+        MHelp.GotoKeyword(sKeyword, sKeyword2)
       Endif
       Return
 
     Else If Highlight.Types[iCpt] = Highlight.DataType Then 
-
       sKeyword = Highlight.Symbols[iCpt]
       If bPopupHelp Then
-        If MHelp.GotoDataType(sKeyword) Then
-          hClass = CComponent.Classes[sKeyword]
-          If hClass Then 
-            MHelp.GotoClass(hClass.Component, hClass.Name)
-          Endif 
-        Endif
-      Else
         If FHelp.ShowDatatypeHelp(Editor, sKeyword) Then
           hClass = CComponent.Classes[sKeyword]
           If hClass Then 
             FHelp.ShowClassHelp(Editor, hClass.Component, hClass.Name)
           Endif 
         Endif
+      Else
+        If MHelp.GotoDataType(sKeyword) Then
+          hClass = CComponent.Classes[sKeyword]
+          If hClass Then 
+            MHelp.GotoClass(hClass.Component, hClass.Name)
+          Endif 
+        Endif
       Endif
       Return
     Endif