diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index fc5a0f40ae..310b0ac728 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -5113,7 +5113,10 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
                         space -= m_propHover->GetImageOffset(imageWidth);
                         space -= (wxPG_XBEFORETEXT + 1);
                         int tw, th;
-                        GetTextExtent( tipString, &tw, &th, 0, 0 );
+                        wxFont* font = NULL;
+                        if ( (m_windowStyle & wxPG_BOLD_MODIFIED) && m_propHover->HasFlag(wxPG_PROP_MODIFIED) )
+                            font = &m_captionFont;
+                        GetTextExtent( tipString, &tw, &th, 0, 0, font );
                         if ( tw > space )
                             SetToolTip( tipString );
                     }