diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html
index 8c3e8166b..5b26ee3c5 100644
--- a/guacamole/src/main/webapp/index.html
+++ b/guacamole/src/main/webapp/index.html
@@ -214,6 +214,10 @@
                 var guacErrorImage = new Image();
                 guacErrorImage.src = "images/noguacamole-logo.png";
 
+                guac.setNameHandler(function(name) {
+                    document.title = name;
+                });
+
                 guac.setErrorHandler(function(error) {
                     menu.className = "error";
                     logo.src = guacErrorImage.src;