minor code fix for completion window
Merge pull request #3085 from aparajit-pratap/master

Cross-merge from master