diff --git a/website/client/src/components/tasks/spells.vue b/website/client/src/components/tasks/spells.vue
index c3e442793b..481539a9d6 100644
--- a/website/client/src/components/tasks/spells.vue
+++ b/website/client/src/components/tasks/spells.vue
@@ -40,7 +40,7 @@
                 v-for="(skill, key) in spells[user.stats.class]"
                 v-if="user.stats.lvl >= skill.lvl"
                 :key="key"
-                v-b-popover.hover.auto="skill.notes()"
+                v-b-popover.hover.auto="skillNotes(skill)"
                 class="col-12 col-md-3"
                 @click="castStart(skill)"
               >
@@ -204,9 +204,9 @@
 </style>
 
 <script>
-import spells from '@/../../common/script/content/spells';
+import spells, { stealthBuffsToAdd } from '@/../../common/script/content/spells';
 
-import { mapState } from '@/libs/store';
+import { mapState, mapGetters } from '@/libs/store';
 import notifications from '@/mixins/notifications';
 import spellsMixin from '@/mixins/spells';
 import Drawer from '@/components/ui/drawer';
@@ -237,6 +237,9 @@ export default {
   },
   computed: {
     ...mapState({ user: 'user.data' }),
+    ...mapGetters({
+      getUnfilteredTaskList: 'tasks:getUnfilteredTaskList',
+    }),
     openStatus () {
       return this.$store.state.spellOptions.spellDrawOpen ? 1 : 0;
     },
@@ -267,18 +270,12 @@ export default {
       );
     },
     spellDisabled (skill) {
-      if (skill === 'frost' && this.user.stats.buffs.streaks) {
-        return true;
-      }
-      // @TODO: Implement
-      // } else if (skill === 'stealth' && this.user.stats.buffs.stealth
-      // >= this.user.dailys.length) {
-      //   return true;
-      // }
+      const incompleteDailiesDue = this.getUnfilteredTaskList('daily').filter(daily => !daily.completed && daily.isDue).length;
+      if (skill === 'frost' && this.user.stats.buffs.streaks) return true;
+      if (skill === 'stealth' && this.user.stats.buffs.stealth >= incompleteDailiesDue) return true;
 
       return false;
     },
-    // @TODO is this used?
     skillNotes (skill) {
       let notes = skill.notes();
 
@@ -289,7 +286,7 @@ export default {
       } else if (skill.key === 'stealth') {
         notes = this.$t('spellRogueStealthDaliesAvoided', {
           originalText: notes,
-          number: this.user.stats.buffs.stealth,
+          number: stealthBuffsToAdd(this.user),
         });
       }
 
diff --git a/website/common/locales/en/spells.json b/website/common/locales/en/spells.json
index aa73813e75..231a944476 100644
--- a/website/common/locales/en/spells.json
+++ b/website/common/locales/en/spells.json
@@ -36,7 +36,7 @@
 
   "spellRogueStealthText": "Stealth",
   "spellRogueStealthNotes": "With each cast, a few of your undone Dailies won't cause damage tonight. Their streaks and colors won't change. (Based on: PER)",
-  "spellRogueStealthDaliesAvoided": "<%= originalText %> Number of dailies avoided: <%= number %>.",
+  "spellRogueStealthDaliesAvoided": "<%= originalText %> Number of dailies that will be avoided: <%= number %>.",
   "spellRogueStealthMaxedOut": "You have already avoided all your dailies; there's no need to cast this again.",
 
   "spellHealerHealText": "Healing Light",
diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js
index 2f06352300..29d6c019af 100644
--- a/website/common/script/content/spells.js
+++ b/website/common/script/content/spells.js
@@ -45,6 +45,12 @@ function calculateBonus (value, stat, critVal = 1, statScale = 0.5) {
   return (value < 0 ? 1 : value + 1) + stat * statScale * critVal;
 }
 
+export function stealthBuffsToAdd (user) {
+  return Math.ceil(diminishingReturns(
+    statsComputed(user).per, user.tasksOrder.dailys.length * 0.64, 55,
+  ));
+}
+
 const spells = {};
 
 spells.wizard = {
@@ -208,9 +214,7 @@ spells.rogue = {
     notes: t('spellRogueStealthNotes'),
     cast (user) {
       if (!user.stats.buffs.stealth) user.stats.buffs.stealth = 0;
-      user.stats.buffs.stealth += Math.ceil(diminishingReturns(
-        statsComputed(user).per, user.tasksOrder.dailys.length * 0.64, 55,
-      ));
+      user.stats.buffs.stealth += stealthBuffsToAdd(user);
     },
   },
 };