diff --git a/client/src/components/pipelines/browser/Folder.js b/client/src/components/pipelines/browser/Folder.js
index fa960751db..1d2581df22 100644
--- a/client/src/components/pipelines/browser/Folder.js
+++ b/client/src/components/pipelines/browser/Folder.js
@@ -694,7 +694,10 @@ export default class Folder extends localization.LocalizedReactComponent {
       message.error(request.error, 5);
     } else {
       this.closeRenameFolderDialog();
-      await this.props.folder.fetch();
+      await Promise.all([
+        this.props.pipelinesLibrary.fetch(),
+        this.props.folder.fetch()
+      ]);
       if (this.props.onReloadTree) {
         this.props.onReloadTree(!this._currentFolder.folder.parentId);
       }
@@ -718,7 +721,10 @@ export default class Folder extends localization.LocalizedReactComponent {
       message.error(request.error, 5);
     } else {
       this.closeRenameFolderDialog();
-      await this.props.folder.fetch();
+      await Promise.all([
+        this.props.pipelinesLibrary.fetch(),
+        this.props.folder.fetch()
+      ]);
       if (this.props.onReloadTree) {
         this.props.onReloadTree(!this._currentFolder.folder.parentId);
       }
diff --git a/client/src/components/special/Breadcrumbs.js b/client/src/components/special/Breadcrumbs.js
index 8a5659962f..15649049d0 100644
--- a/client/src/components/special/Breadcrumbs.js
+++ b/client/src/components/special/Breadcrumbs.js
@@ -271,12 +271,4 @@ export default class Breadcrumbs extends React.Component {
       </div>
     );
   }
-
-  componentWillReceiveProps (nextProps) {
-    if (`${this.props.id}` !== `${nextProps.id}` || this.props.type !== nextProps.type) {
-      (async () => {
-        await this.props.pipelinesLibrary.fetch();
-      })();
-    }
-  }
 }