diff --git a/toontown/estate/DistributedEstate.py b/toontown/estate/DistributedEstate.py
index d02390a4..e3e9cf69 100755
--- a/toontown/estate/DistributedEstate.py
+++ b/toontown/estate/DistributedEstate.py
@@ -408,6 +408,8 @@ class DistributedEstate(DistributedObject.DistributedObject):
                 self.popupFishGUI()
 
     def __handleFishSaleDone(self, sell=0):
+        base.setCellsAvailable(base.bottomCells, 1)
+        base.cr.playGame.getPlace().setState('walk')
         self.ignore(self.fishGuiDoneEvent)
         self.sendUpdate('completeFishSale', [sell])
         self.ignore('stoppedAsleep')
@@ -415,6 +417,8 @@ class DistributedEstate(DistributedObject.DistributedObject):
         self.fishGui = None
 
     def popupFishGUI(self):
+        base.setCellsAvailable(base.bottomCells, 0)
+        base.cr.playGame.getPlace().setState('stopped')
         self.acceptOnce(self.fishGuiDoneEvent, self.__handleFishSaleDone)
         self.fishGui = FishSellGUI.FishSellGUI(self.fishGuiDoneEvent)
         self.accept('stoppedAsleep', self.__handleFishSaleDone)
diff --git a/toontown/estate/Estate.py b/toontown/estate/Estate.py
index 0ff52e5e..8081a66b 100755
--- a/toontown/estate/Estate.py
+++ b/toontown/estate/Estate.py
@@ -44,7 +44,8 @@ class Estate(Place.Place):
           'teleportOut',
           'doorOut',
           'push',
-          'pet']),
+          'pet',
+          'activity']),
          State.State('stopped', self.enterStopped, self.exitStopped, ['walk', 'teleportOut']),
          State.State('sit', self.enterSit, self.exitSit, ['walk']),
          State.State('push', self.enterPush, self.exitPush, ['walk']),
@@ -57,7 +58,8 @@ class Estate(Place.Place):
           'doorOut',
           'push',
           'pet',
-          'teleportOut']),
+          'teleportOut',
+          'activity']),
          State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk', 'petTutorial']),
          State.State('teleportOut', self.enterTeleportOut, self.exitTeleportOut, ['teleportIn', 'walk', 'final']),
          State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk']),