diff --git a/app/app/components/document/document-history.js b/app/app/components/document/document-history.js
index fc937c98..73cf62bb 100644
--- a/app/app/components/document/document-history.js
+++ b/app/app/components/document/document-history.js
@@ -34,6 +34,10 @@ export default Ember.Component.extend({
 		this.sizeSidebar();
 	},
 
+	willDestroyElement() {
+		this.eventBus.unsubscribe('resized');
+	},
+
 	sizeSidebar() {
 		let size = $(window).height() - 200;
 		this.$('.document-history > .sidebar').css('height', size + "px");
diff --git a/app/app/components/document/document-sidebar.js b/app/app/components/document/document-sidebar.js
index 52f5dd32..e280177d 100644
--- a/app/app/components/document/document-sidebar.js
+++ b/app/app/components/document/document-sidebar.js
@@ -42,6 +42,8 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
 	},
 
 	willDestroyElement() {
+        this.eventBus.unsubscribe('resized');
+		this.eventBus.unsubscribe('scrolled');
 		this.destroyTooltips();
 	},
 
diff --git a/app/app/components/folder/folders-list.js b/app/app/components/folder/folders-list.js
index 4925d300..69ad16d9 100644
--- a/app/app/components/folder/folders-list.js
+++ b/app/app/components/folder/folders-list.js
@@ -80,6 +80,12 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
 		this.eventBus.subscribe('scrolled', this, 'positionTool');
 	},
 
+	willDestroyElement() {
+		this.eventBus.unsubscribe('resized');
+		this.eventBus.unsubscribe('scrolled');
+		this.destroyTooltips();
+	},
+
 	didReceiveAttrs() {
 		let folders = this.get('folders');
 
@@ -111,10 +117,6 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
 		this.set('hasProtectedFolders', this.get('protectedFolders.length') > 0);
 	},
 
-	willDestroyElement() {
-		this.destroyTooltips();
-	},
-
 	positionTool() {
 		if (this.get('isDestroyed') || this.get('isDestroying')) {
 			return;
diff --git a/app/app/components/layout/zone-navigation.js b/app/app/components/layout/zone-navigation.js
index 460bc55d..5ed7f101 100644
--- a/app/app/components/layout/zone-navigation.js
+++ b/app/app/components/layout/zone-navigation.js
@@ -128,6 +128,9 @@ export default Ember.Component.extend(TooltipMixin, {
 			sortable.destroy();
 		}
 
+		this.eventBus.unsubscribe('resized');
+		this.eventBus.unsubscribe('pinChange');
+
 		this.destroyTooltips();
 	},