diff --git a/src/aoapplication.cpp b/src/aoapplication.cpp
index 1e78ef5..13c995f 100644
--- a/src/aoapplication.cpp
+++ b/src/aoapplication.cpp
@@ -32,7 +32,7 @@ AOApplication::AOApplication(int &argc, char **argv) : QApplication(argc, argv)
   original_message_handler = qInstallMessageHandler(message_handler);
 
   setApplicationVersion(get_version_string());
-  setApplicationDisplayName(tr("Attorney Online 2"));
+  setApplicationDisplayName(tr("Attorney Online %1").arg(applicationVersion()));
 }
 
 AOApplication::~AOApplication()
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index 8ac1b28..e032613 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -173,7 +173,6 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
     courtroom_loaded = false;
 
-    window_title = tr("Attorney Online %1").arg(applicationVersion());
     int selected_server = w_lobby->get_selected_server();
 
     QString server_address = "", server_name = "";
@@ -183,7 +182,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
         server_name = info.name;
         server_address =
             QString("%1:%2").arg(info.ip, QString::number(info.port));
-        window_title += ": " + server_name;
+        window_title = server_name;
       }
     }
     else {
@@ -192,7 +191,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
         server_name = info.name;
         server_address =
             QString("%1:%2").arg(info.ip, QString::number(info.port));
-        window_title += ": " + server_name;
+        window_title = server_name;
       }
     }