diff --git a/public/js/controllers/inventoryCtrl.js b/public/js/controllers/inventoryCtrl.js
index d9c70185bd..212cf3513b 100644
--- a/public/js/controllers/inventoryCtrl.js
+++ b/public/js/controllers/inventoryCtrl.js
@@ -84,9 +84,6 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', '$window', 'User',
     }
 
     $scope.purchase = function(type, item){
-      var completedPrevious = !item.previous || (User.user.achievements.quests && User.user.achievements.quests[item.previous]);
-      if (!completedPrevious)
-        return alert("You must first complete " + $rootScope.Content.quests[item.previous].text + '.');
       var gems = User.user.balance * 4;
       if(gems < item.value) return $rootScope.modals.buyGems = true;
       var string = (type == 'hatchingPotion') ? 'hatching potion' : type; // give hatchingPotion a space
@@ -120,7 +117,11 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', '$window', 'User',
     }
 
     $scope.showQuest = function(quest) {
-      $rootScope.selectedQuest = Content.quests[quest];
+        var item =  Content.quests[quest];
+        var completedPrevious = !item.previous || (User.user.achievements.quests && User.user.achievements.quests[item.previous]);
+        if (!completedPrevious)
+            return alert("You must first complete " + $rootScope.Content.quests[item.previous].text + '.');
+        $rootScope.selectedQuest = item;
       $rootScope.modals.showQuest = true;
     }
     $scope.closeQuest = function(){
diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade
index 54f634682c..b864cde8cc 100644
--- a/views/options/inventory/inventory.jade
+++ b/views/options/inventory/inventory.jade
@@ -46,8 +46,8 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
           menu.pets-menu(label='Quest Scrolls ({{questCount}})')
             p.muted(ng-show='questCount < 1') You don't have any quest scrolls.
             p.muted Quests require parties. If you want to quest solo, <a href="/#/options/groups/party">create an empty party</a>
-            div(ng-repeat='(quest,points) in ownedItems(user.items.quests)')
-              button.customize-option(popover='{{Content.quests[quest].notes}}', popover-title='{{Content.quests[quest].text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='showQuest(quest)', class='inventory_quest_scroll')
+            div(ng-repeat='(quest_key,points) in ownedItems(user.items.quests)', ng-init='quest = Content.quests[quest_key]')
+              button.customize-option(popover='{{quest.previous && !user.achievements.quests[quest.previous] ? "You need to complete the previous quest to start this one!" : quest.notes}}', popover-title='{{quest.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='showQuest(quest_key)', class='inventory_quest_scroll', ng-class='{locked: quest.previous && !user.achievements.quests[quest.previous]}')
                 .badge.badge-info.stack-count {{points}}
 
         li.customize-menu