diff --git a/public/javascripts/outfits/edit.js b/public/javascripts/outfits/edit.js
index 0b4545c6..5a2871b8 100644
--- a/public/javascripts/outfits/edit.js
+++ b/public/javascripts/outfits/edit.js
@@ -695,7 +695,7 @@ View.PetStateForm = function (wardrobe) {
         label.appendTo(li);
         li.appendTo(ul);
       }
-      updatePetState(wardrobe.outfit.pet_state);
+      updatePetState(wardrobe.outfit.getPetState());
     }
   });
   
diff --git a/public/javascripts/wardrobe.js b/public/javascripts/wardrobe.js
index 4e2de5ce..0391bcfa 100644
--- a/public/javascripts/wardrobe.js
+++ b/public/javascripts/wardrobe.js
@@ -745,8 +745,8 @@ function Wardrobe() {
     function setFullOutfit(new_outfit) {
       outfit = new_outfit;
       controller.in_transaction = true;
-      controller.setPetTypeByColorAndSpecies(outfit.color_id, outfit.species_id);
       controller.setPetStateById(outfit.pet_state_id);
+      controller.setPetTypeByColorAndSpecies(outfit.color_id, outfit.species_id);
       controller.setClosetItemsByIds(outfit.getClosetItemIds());
       controller.setWornItemsByIds(outfit.getWornItemIds());
       controller.events.trigger('setOutfit', outfit);
@@ -774,6 +774,10 @@ function Wardrobe() {
       return outfit;
     }
     
+    this.getPetState = function () {
+      return outfit.pet_state;
+    }
+    
     this.getPetType = function () {
       return outfit.pet_type;
     }