Variable picker improvement, grid will be always selecteable
Merge pull request #2323 from julceslauhub/master

Variable picker improvement, grid will be always selecteable