diff --git a/src/main/java/ChatClient.java b/src/main/java/ChatClient.java
index d3d6300..b9b93b5 100644
--- a/src/main/java/ChatClient.java
+++ b/src/main/java/ChatClient.java
@@ -60,6 +60,7 @@ public class ChatClient extends JFrame implements KeyListener {
         
         catch (Exception e) {
             JOptionPane.showMessageDialog(null, "Verbindung zum Server \"" + address + "\" fehlgeschlagen.");
+            dispose();
         }
         finally {
         	if (connectionToServer != null) {