diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp
index 340896c9..4a7adcaa 100755
--- a/src/connectdlg.cpp
+++ b/src/connectdlg.cpp
@@ -391,9 +391,17 @@ void CConnectDlg::SetPingTimeAndNumClientsResult ( CHostAddress& InetAddr,
                 break;
             }
 
-            // update ping text
-            lvwServers->topLevelItem ( iIdx )->
-                setText ( 1, QString().setNum ( iPingTime ) + " ms" );
+            // update ping text, take special care if ping time exceeds a
+            // certain value
+            if ( iPingTime > 500 )
+            {
+                lvwServers->topLevelItem ( iIdx )->setText ( 1, ">500 ms" );
+            }
+            else
+            {
+                lvwServers->topLevelItem ( iIdx )->
+                    setText ( 1, QString().setNum ( iPingTime ) + " ms" );
+            }
 
             // update number of clients text
             lvwServers->topLevelItem ( iIdx )->