diff --git a/gui/app/pods/folder/index/route.js b/gui/app/pods/folder/index/route.js
index 57ddf736..49d0a3e8 100644
--- a/gui/app/pods/folder/index/route.js
+++ b/gui/app/pods/folder/index/route.js
@@ -44,11 +44,14 @@ export default Route.extend(AuthenticatedRouteMixin, {
 			d.set('selected', false);
 		});
 
+		let labelId = this.modelFor('folder').folder.get('labelId');
+
 		return hash({
 			folder: this.modelFor('folder').folder,
 			permissions: this.modelFor('folder').permissions,
-			label: 	_.find(this.modelFor('folder').labels, {id: this.modelFor('folder').folder.get('labelId')}),
+			label: 	_.find(this.modelFor('folder').labels, {id: labelId}),
 			labels: this.modelFor('folder').labels,
+			labelSpaces: _.filter(folders, function(s) { return s.get('labelId') === labelId; }),
 			folders: folders,
 			documents: documents,
 			documentsDraft: _.filter(documents, function(d) { return d.get('lifecycle') === constants.Lifecycle.Draft; }),
diff --git a/gui/app/pods/folder/index/template.hbs b/gui/app/pods/folder/index/template.hbs
index 2e824269..ea2d137a 100644
--- a/gui/app/pods/folder/index/template.hbs
+++ b/gui/app/pods/folder/index/template.hbs
@@ -45,19 +45,19 @@
 			<div class="space-label">Unclassified</div>
 		{{else}}
 			<div class="space-label" style={{{model.label.bgColor}}}>{{model.label.name}}</div>
-			<i class="space-label-dropdown dicon {{constants.Icon.ArrowSmallDown}}">
-				{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false placement="bottom-middle"}}
-					<ul class="menu">
-						{{#each model.folders as |space|}}
-							{{#if (eq space.labelId model.label.id)}}
+			{{#if (gt model.labelSpaces.length 1)}}
+				<i class="space-label-dropdown dicon {{constants.Icon.ArrowSmallDown}}">
+					{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false placement="bottom-middle"}}
+						<ul class="menu">
+							{{#each model.labelSpaces as |space|}}
 								{{#if (not-eq space.id model.folder.id)}}
 									{{#link-to "folder.index" space.id space.slug class="item"}}{{space.name}}{{/link-to}}
 								{{/if}}
-							{{/if}}
-						{{/each}}
-					</ul>
-				{{/attach-popover}}
-			</i>
+							{{/each}}
+						</ul>
+					{{/attach-popover}}
+				</i>
+			{{/if}}
 		{{/if}}
 
 		{{layout/logo-heading