diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7db7951cb0..4d1d8d353c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-06 15:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbqt/hbqt_hbqplaintextedit.cpp
+    ! Corrected: code completion popup's vertical positioning.
+      It was not nonoring the visibility of horizintal ruler.
+
 2010-07-06 23:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/common/hbffind.c
   * src/common/hbwin.c
diff --git a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp b/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
index f2223cf4e3..cf3c3bd30b 100644
--- a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
+++ b/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
@@ -1315,8 +1315,8 @@ void HBQPlainTextEdit::keyPressEvent( QKeyEvent * event )
    QRect cr = cursorRect();
 
    cr.setWidth( c->popup()->sizeHintForColumn( 0 ) + c->popup()->verticalScrollBar()->sizeHint().width() );
-   cr.setTop( cr.top() + 25 );
-   cr.setBottom( cr.bottom() + 25 );
+   cr.setTop( cr.top() + horzRulerHeight + 5 );
+   cr.setBottom( cr.bottom() + horzRulerHeight + 5 );
 
    c->complete( cr ); // popup it up!
 }