diff --git a/website/client/js/controllers/inventoryCtrl.js b/website/client/js/controllers/inventoryCtrl.js
index 81da16ffd0..6650d6586e 100644
--- a/website/client/js/controllers/inventoryCtrl.js
+++ b/website/client/js/controllers/inventoryCtrl.js
@@ -62,12 +62,17 @@ habitrpg.controller("InventoryCtrl",
 
         var item = Content.gear.flat[key];
 
-        if (item.klass == User.user.stats.class)
-        {
-          item.str = item.str * 1.5;
-          item.con = item.con * 1.5;
-          item.per = item.per * 1.5;
-          item.int = item.int * 1.5;
+        if (item.klass == User.user.stats.class || item.specialClass == User.user.stats.class) {
+          item._effectiveStr = item.str * 1.5;
+          item._effectiveCon = item.con * 1.5;
+          item._effectivePer = item.per * 1.5;
+          item._effectiveInt = item.int * 1.5;
+        }
+        else {
+          item._effectiveStr = item.str;
+          item._effectiveCon = item.con;
+          item._effectivePer = item.per;
+          item._effectiveInt = item.int;
         }
 
         if (!$scope.gearByClass[item.klass]) {
diff --git a/website/client/js/controllers/sortableInventoryCtrl.js b/website/client/js/controllers/sortableInventoryCtrl.js
index 0c60b3a15f..7bf2641b02 100644
--- a/website/client/js/controllers/sortableInventoryCtrl.js
+++ b/website/client/js/controllers/sortableInventoryCtrl.js
@@ -1,10 +1,10 @@
 habitrpg.controller('SortableInventoryController', ['$scope',
   function ($scope) {
     var attributeSort = {
-      constitution: ['-con', '-(con+int+per+str)'],
-      intelligence: ['-int', '-(con+int+per+str)'],
-      perception: ['-per', '-(con+int+per+str)'],
-      strength: ['-str', '-(con+int+per+str)'],
+      constitution: ['-(_effectiveCon)', '-(_effectiveCon+_effectiveInt+_effectivePer+_effectiveStr)'],
+      intelligence: ['-(_effectiveInt)', '-(_effectiveCon+_effectiveInt+_effectivePer+_effectiveStr)'],
+      perception: ['-(_effectivePer)', '-(_effectiveCon+_effectiveInt+_effectivePer+_effectiveStr)'],
+      strength: ['-(_effectiveStr)', '-(_effectiveCon+_effectiveInt+_effectivePer+_effectiveStr)'],
       set: 'set'
     }