diff --git a/client/modules/IDE/components/CollectionList/CollectionList.jsx b/client/modules/IDE/components/CollectionList/CollectionList.jsx
index cbf0613f..58b9bc45 100644
--- a/client/modules/IDE/components/CollectionList/CollectionList.jsx
+++ b/client/modules/IDE/components/CollectionList/CollectionList.jsx
@@ -28,6 +28,18 @@ class CollectionList extends React.Component {
this.props.getCollections(this.props.username);
this.props.resetSorting();
this._renderFieldHeader = this._renderFieldHeader.bind(this);
+
+ this.state = {
+ hasLoadedData: false,
+ };
+ }
+
+ componentDidUpdate(prevProps) {
+ if (prevProps.loading === true && this.props.loading === false) {
+ this.setState({
+ hasLoadedData: true,
+ });
+ }
}
getTitle() {
@@ -38,11 +50,11 @@ class CollectionList extends React.Component {
}
hasCollections() {
- return !this.props.loading && this.props.collections.length > 0;
+ return (!this.props.loading || this.state.hasLoadedData) && this.props.collections.length > 0;
}
_renderLoader() {
- if (this.props.loading) return