diff --git a/guacamole/src/main/webapp/scripts/guac-ui.js b/guacamole/src/main/webapp/scripts/guac-ui.js
index e1ac34b0a..462eb133b 100644
--- a/guacamole/src/main/webapp/scripts/guac-ui.js
+++ b/guacamole/src/main/webapp/scripts/guac-ui.js
@@ -146,13 +146,17 @@ GuacUI.openObject = function(id, parameters) {
     if (parameters)
         url += "&" + parameters;
 
-    // Attempt to focus existing window
-    var current = window.open(null, id);
+    // Attempt to pull existing window
+    var current = window.open("", id);
 
     // If window did not already exist, set up as
     // Guacamole client
-    if (!current.GuacUI)
-        window.open(url, id);
+    if (!current || !current.GuacUI)
+        current = window.open(url, id);
+
+    // Focus (possibly) existing window
+    if (current)
+        current.focus();
 
 };