diff --git a/include/lobby.h b/include/lobby.h
index 5b1add7..18d4c4e 100644
--- a/include/lobby.h
+++ b/include/lobby.h
@@ -48,6 +48,7 @@ public:
   QString get_chatlog();
   int get_selected_server();
   void enable_connect_button();
+  void reset_selection();
 
   void set_loading_value(int p_value);
 
diff --git a/src/lobby.cpp b/src/lobby.cpp
index c0d0e4d..46f6faa 100644
--- a/src/lobby.cpp
+++ b/src/lobby.cpp
@@ -301,6 +301,8 @@ void Lobby::on_public_servers_clicked()
   ui_public_servers->set_image("publicservers_selected");
   ui_favorites->set_image("favorites");
 
+  reset_selection();
+
   list_servers();
 
   public_servers_selected = true;
@@ -311,6 +313,8 @@ void Lobby::on_favorites_clicked()
   ui_favorites->set_image("favorites_selected");
   ui_public_servers->set_image("publicservers");
 
+  reset_selection();
+
   ao_app->set_favorite_list();
 
   list_favorites();
@@ -318,6 +322,16 @@ void Lobby::on_favorites_clicked()
   public_servers_selected = false;
 }
 
+void Lobby::reset_selection()
+{
+  last_index = -1;
+  ui_server_list->clearSelection();
+  ui_player_count->setText(tr("Offline"));
+  ui_description->clear();
+
+  ui_connect->setEnabled(false);
+}
+
 void Lobby::on_refresh_pressed() { ui_refresh->set_image("refresh_pressed"); }
 
 void Lobby::on_refresh_released()