Fix for Store issue 858 - spinner in company selector stays forever

Fix for https://github.com/Rise-Vision/store/issues/858

@settinghead @stevesherrie could one of you review. Thanks.