Fixes #1080 issue with computer and tablet only grid