diff --git a/ChangeLog b/ChangeLog
index da33eba3..fb5b5f2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
 
 - new app icon for Jamulus, created by geheimerEichkater (#410)
 
+- add special server list filter for filtering occupied servers by using "#" (#397)
+
 - bug fix: grouping faders in the client should be proportional (see discussion in #202, #419)
 
 
diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp
index 332b45aa..494a0573 100755
--- a/src/connectdlg.cpp
+++ b/src/connectdlg.cpp
@@ -227,9 +227,6 @@ void CConnectDlg::RequestServerList()
     // clear server list view
     lvwServers->clear();
 
-    // clear filter edit box
-    edtFilter->setText ( "" );
-
     // update list combo box (disable events to avoid a signal)
     cbxCentServAddrType->blockSignals ( true );
     cbxCentServAddrType->setCurrentIndex ( static_cast<int> ( pClient->GetCentralServerAddressType() ) );
@@ -481,6 +478,9 @@ void CConnectDlg::SetConnClientsList ( const CHostAddress&          InetAddr,
             // to show the children
             lvwServers->setRootIsDecorated ( true );
         }
+
+        // the clients list may have changed, update the filter selection
+        UpdateListFilter();
     }
 }
 
@@ -569,6 +569,14 @@ void CConnectDlg::UpdateListFilter()
                 bFilterFound = true;
             }
 
+            // special case: filter for occupied servers
+            // DEFINITION: if "#" is set at the beginning of the filter text, we show
+            //             occupied servers (#397)
+            if ( ( sFilterText.indexOf ( "#" ) == 0 ) && ( pCurListViewItem->childCount() > 0 ) )
+            {
+                bFilterFound = true;
+            }
+
             // search children
             for ( int iCCnt = 0; iCCnt < pCurListViewItem->childCount(); iCCnt++ )
             {