diff --git a/optional/handlers/house/house.simba b/optional/handlers/house/house.simba
index 61abe046..b574121e 100644
--- a/optional/handlers/house/house.simba
+++ b/optional/handlers/house/house.simba
@@ -1392,11 +1392,18 @@ begin
   if Login.PlayerIndex <> House.Loader.LayoutIndex then
   begin
     House.Loader.Free();
+
+    House.Loader.Init(32, 13);
+
+    combobox := TPanel(sender).GetChild('location_combobox');
+    combobox.SetItemIndex(Ord(House.Loader.Location));
+
     combobox := TPanel(sender).GetChild('decoration_combobox');
-    Self.POHDecorationUpdate(combobox);
+    combobox.SetItemIndex(Ord(House.Loader.Decoration));
 
     combobox := TPanel(sender).GetChild('room_combobox');
     combobox.SetItemIndex(Ord(House.Loader.ReadRoom(House.Loader.Selected.Matrix).Room));
+
     Self.RoomUpdate(combobox);
   end;
 end;