diff --git a/app/app/components/folder/folders-list.js b/app/app/components/folder/folders-list.js
index 5bfe7030..bfc46f2d 100644
--- a/app/app/components/folder/folders-list.js
+++ b/app/app/components/folder/folders-list.js
@@ -50,12 +50,6 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
 	},
 
 	didInsertElement() {
-		this._super(...arguments);
-
-		if (this.session.authenticated) {
-			this.addTooltip(document.getElementById("add-space-button"));
-		}
-
 		this.eventBus.subscribe('resized', this, 'positionTool');
 		this.eventBus.subscribe('scrolled', this, 'positionTool');
 	},
@@ -115,7 +109,7 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
 
 	navigateToDocument(document) {
         this.attrs.showDocument(this.get('folder'), document);
-    },	
+    },
 
 	actions: {
 		scrollTop() {
diff --git a/app/app/templates/components/folder/folders-list.hbs b/app/app/templates/components/folder/folders-list.hbs
index e3cfee9e..a0cbc629 100644
--- a/app/app/templates/components/folder/folders-list.hbs
+++ b/app/app/templates/components/folder/folders-list.hbs
@@ -1,5 +1,5 @@
 {{#if session.isEditor}}
-	<div id="add-space-button" class="regular-button button-white" data-tooltip="Share" data-tooltip-position="top center">
+	<div id="add-space-button" class="regular-button button-white">
 		<i class="material-icons">add</i>
 		<div class="name">Space</div>
 	</div>