diff --git a/app/components/detail-terms-list-item.js b/app/components/detail-terms-list-item.js
index bf8588b674..7efd3afae5 100644
--- a/app/components/detail-terms-list-item.js
+++ b/app/components/detail-terms-list-item.js
@@ -1,14 +1,11 @@
 import Ember from 'ember';
 
-const { Component, computed } = Ember;
+const { Component } = Ember;
 
 export default Component.extend({
   tagName: 'li',
   canEdit: false,
   term: null,
-  tooltipContent: computed('term.description', function() {
-    return this.get('term.description');
-  }),
   click: function() {
     if (this.get('canEdit')) {
       let term = this.get('term');
diff --git a/app/components/selectable-terms-list-item.js b/app/components/selectable-terms-list-item.js
index 5a7e540ced..fd275f3220 100644
--- a/app/components/selectable-terms-list-item.js
+++ b/app/components/selectable-terms-list-item.js
@@ -14,10 +14,6 @@ export default Component.extend({
     return selectedTerms.contains(term);
   }),
 
-  tooltipContent: computed('term.description', function() {
-    return this.get('term.description');
-  }),
-
   click: function() {
     let term = this.get('term');
     if (this.get('isSelected')) {
diff --git a/app/templates/components/detail-terms-list-item.hbs b/app/templates/components/detail-terms-list-item.hbs
index eedc71e254..7e8bc63bb0 100644
--- a/app/templates/components/detail-terms-list-item.hbs
+++ b/app/templates/components/detail-terms-list-item.hbs
@@ -1,3 +1,8 @@
+{{#if term.description.length}}
+  {{#tooltip-on-component}}
+    {{term.description}}
+  {{/tooltip-on-component}}
+{{/if}}
 {{#if term.isTopLevel}}
   {{term.title}}
 {{else}}
diff --git a/app/templates/components/selectable-terms-list-item.hbs b/app/templates/components/selectable-terms-list-item.hbs
index dba907b735..bec6712c88 100644
--- a/app/templates/components/selectable-terms-list-item.hbs
+++ b/app/templates/components/selectable-terms-list-item.hbs
@@ -1,3 +1,8 @@
+{{#if term.description.length}}
+  {{#tooltip-on-component}}
+    {{term.description}}
+  {{/tooltip-on-component}}
+{{/if}}
 {{term.title}}
 <span class="actions">
   {{#if isSelected}}
diff --git a/bower.json b/bower.json
index 26d7e7dc2b..3271affe90 100644
--- a/bower.json
+++ b/bower.json
@@ -11,7 +11,6 @@
     "blanket": "~1.1.7",
     "lodash": "~4.0.0",
     "Faker": "~3.0.1",
-    "tooltipster": "~3.3.0",
     "font-awesome": "~4.5.0",
     "pikaday": "~1.3.3",
     "moment": ">= 2.8.0",
diff --git a/package.json b/package.json
index a7aba9fc99..29268bb99e 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,6 @@
     "ember-cli-deploy-s3-index": "0.5.0",
     "ember-cli-deprecation-workflow": "0.2.2",
     "ember-cli-flash": "1.3.15",
-    "ember-font-awesome": "2.1.1",
     "ember-cli-htmlbars": "^1.0.3",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.4.0",
@@ -64,6 +63,7 @@
     "ember-cp-validations": "2.9.3",
     "ember-data": "^2.6.0",
     "ember-export-application-global": "^1.0.5",
+    "ember-font-awesome": "2.1.1",
     "ember-froala": "2.3.2",
     "ember-i18n": "4.2.1",
     "ember-i18n-cp-validations": "2.5.0",
@@ -82,6 +82,7 @@
     "ember-rl-dropdown": "0.7.0",
     "ember-simple-auth": "1.1.0",
     "ember-simple-auth-token": "1.1.1",
+    "ember-tether": "0.3.1",
     "ember-tooltips": "1.0.0",
     "ember-truth-helpers": "1.2.0",
     "ember-watson": "^0.8.0",