diff --git a/src/charselect.cpp b/src/charselect.cpp
index b543934..f8c622d 100644
--- a/src/charselect.cpp
+++ b/src/charselect.cpp
@@ -148,8 +148,6 @@ void Courtroom::char_clicked(int n_char)
   else
     update_character(n_char);
 
-  enter_courtroom();
-
   if (n_char != -1)
     ui_ic_chat_name->setPlaceholderText(char_list.at(n_char).name);
 }
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index f712579..1ffbcaf 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -460,6 +460,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
     if (f_contents.size() < 3)
       goto end;
 
+    w_courtroom->enter_courtroom();
+
     if (courtroom_constructed)
       w_courtroom->update_character(f_contents.at(2).toInt());
   }