GWT-679 Bug fix for search window layout. take 2