diff --git a/app/src/gambas3/.src/Debug/FDebugInfo.class b/app/src/gambas3/.src/Debug/FDebugInfo.class
index 04f5c8f4d..1ed5fe0c3 100644
--- a/app/src/gambas3/.src/Debug/FDebugInfo.class
+++ b/app/src/gambas3/.src/Debug/FDebugInfo.class
@@ -762,18 +762,23 @@ End
 
 Private Sub AfterRefreshTask()
   
-  Dim I As Integer
-  
   $aTask.Sort
   $cRefreshTask.Clear
   gvwTask.Rows.Count = $aTask.Count
+  gvwTask_Font
   gvwTask.Refresh
   
+End
+
+Public Sub gvwTask_Font()
+
+  Dim I As Integer
+  
   For I = 0 To gvwTask.Columns.Max - 1
     gvwTask.Columns[I].W = -1
   Next
-  
-End
+
+End  
 
 Public Sub UpdateTask()
   
@@ -932,8 +937,7 @@ Public Sub SetCompilation(Optional sOutput As String)
   Next
   
   gvwCompilation.Rows.Count = I
-  gvwCompilation.Columns[0].Width = -1
-  gvwCompilation.Columns[1].Width = -1
+  gvwCompilation_Font
   
   ShowTab(TAB_COMPILATION)
   'wizDebug[TAB_COMPILATION].Text = ("Warnings") & " (" & gvwCompilation.Rows.Count & ")"
@@ -943,6 +947,14 @@ Public Sub SetCompilation(Optional sOutput As String)
   
 End
 
+Public Sub gvwCompilation_Font()
+  
+  gvwCompilation.Columns[0].Width = -1
+  gvwCompilation.Columns[1].Width = -1
+  
+End
+
+
 Public Sub gvwCompilation_Select()
   
   Dim I As Integer = gvwCompilation.Row
@@ -1088,13 +1100,20 @@ Public Sub RefreshBreakpointView()
   If wizDebug.Index <> TAB_BREAK Then Return
   
   gvwBreakpoint.Rows.Count = Design.GetBreakpoints().Count
-  gvwBreakpoint.Columns[1].Width = -1
-  gvwBreakpoint.Columns[2].Width = -1
+  gvwBreakpoint_Font()
   gvwBreakpoint.Refresh
   gvwBreakpoint_Click
   
 End
 
+Public Sub gvwBreakpoint_Font()
+  
+  gvwBreakpoint.Columns[1].Width = -1
+  gvwBreakpoint.Columns[2].Width = -1
+  
+End
+
+
 Public Sub RemoveAllBreakpoints()
   
   Dim aBreakPoint As String[]
diff --git a/app/src/gambas3/.src/Search/FSearch.class b/app/src/gambas3/.src/Search/FSearch.class
index d0cc0c129..9b44faeab 100644
--- a/app/src/gambas3/.src/Search/FSearch.class
+++ b/app/src/gambas3/.src/Search/FSearch.class
@@ -59,6 +59,8 @@ Public Sub Form_Open()
   chkWordOnly.Value = Settings["/FSearch/WordOnly", False]
   'radSourceFileOnly.Value = Settings["/FSearch/SourceOnly", False]
   
+  gvwFind_Font
+  
 End
 
 Public Sub Form_Close()
@@ -86,8 +88,6 @@ Public Sub ReadConfig()
     Dec $hFont.Size
     If $hFont.Size < 6 Then Break
   Wend
-  $CW = $hFont.TextWidth("W")
-  gvwFind.Refresh
   
   $hStyle = MTheme.GetStyles()
   For I = 0 To $aBrowse.Max
@@ -996,10 +996,13 @@ End
 
 Public Sub gvwFind_Font()
   
-  $CW = gvwFind.Font
-  
-End
+  $CW = $hFont.TextWidth("W")
+  gvwFind.Rows.Height = Max(gvwFind.Font.Height, $hFont.Height) + 4
+  gvwFind.Columns[0].Width = -1
+  gvwFind.Columns[1].Width = -1
+  gvwFind.Refresh
 
+End
 
 Public Sub gvwFind_Draw(X As Integer, Y As Integer, Width As Integer, Height As Integer, Row As Integer, Column As Integer)