diff --git a/client.go b/client.go
index 189afcf..1d19e76 100644
--- a/client.go
+++ b/client.go
@@ -190,6 +190,7 @@ func (c *Client) Emote(message string) {
 
 func (c *Client) handleShell(channel ssh.Channel) {
 	defer channel.Close()
+	defer c.Conn.Close()
 
 	// FIXME: This shouldn't live here, need to restructure the call chaining.
 	c.Server.Add(c)