diff --git a/guacamole-common-js/src/main/resources/guacamole.js b/guacamole-common-js/src/main/resources/guacamole.js
index 72c5fc3bc..31b44e376 100644
--- a/guacamole-common-js/src/main/resources/guacamole.js
+++ b/guacamole-common-js/src/main/resources/guacamole.js
@@ -296,6 +296,57 @@ Guacamole.Blob = function(mimetype, name) {
 
 };
 
+/**
+ * Integer pool which returns consistently increasing integers while integers
+ * are in use, and previously-used integers when possible.
+ * @constructor 
+ */
+Guacamole.IntegerPool = function() {
+
+    /**
+     * Reference to this integer pool.
+     */
+    var guac_pool = this;
+
+    /**
+     * Array of available integers.
+     * @type Number[]
+     */
+    var pool = [];
+
+    /**
+     * The next integer to return if no more integers remain.
+     * @type Number
+     */
+    this.next_int = 0;
+
+    /**
+     * Returns the next available integer in the pool. If possible, a previously
+     * used integer will be returned.
+     * 
+     * @return {Number} The next available integer.
+     */
+    this.next = function() {
+
+        // If free'd integers exist, return one of those
+        if (pool.length > 0)
+            return pool.shift();
+
+        // Otherwise, return a new integer
+        return guac_pool.next_int++;
+
+    };
+
+    /**
+     * Frees the given integer, allowing it to be reused.
+     * 
+     * @param {Number} integer The integer to free.
+     */
+    this.free = function(integer) {
+        pool.push(integer);
+    };
+
+};
 
 /**
  * Abstract stream which can receive data.
@@ -448,6 +499,9 @@ Guacamole.Client = function(tunnel) {
     // No initial blobs
     var blobs = [];
 
+    // Pool of available streams
+    var stream_indices = new Guacamole.IntegerPool();
+
     tunnel.onerror = function(message) {
         if (guac_client.onerror)
             guac_client.onerror(message);
@@ -623,14 +677,28 @@ Guacamole.Client = function(tunnel) {
      * Opens a new file for writing, having the given index, mimetype and
      * filename.
      * 
-     * @param {Number} index The index of the file to write to. This index must
-     *                       be unused.
      * @param {String} mimetype The mimetype of the file being sent.
      * @param {String} filename The filename of the file being sent.
      */
-    this.createFileStream = function(index, mimetype, filename) {
+    this.createFileStream = function(mimetype, filename) {
+
+        // Allocate index
+        var index = stream_indices.next();
+
+        // Create new stream
         guac_client.beginFileStream(index, mimetype, filename);
-        return new Guacamole.OutputStream(guac_client, index);
+        var stream = new Guacamole.OutputStream(guac_client, index);
+
+        // Override close() of stream to automatically free index
+        var old_close = stream.close;
+        stream.close = function() {
+            old_close();
+            stream_indices.free(index);
+        };
+
+        // Return new, overridden stream
+        return stream;
+
     };
 
     /**
diff --git a/guacamole/src/main/webapp/scripts/client-ui.js b/guacamole/src/main/webapp/scripts/client-ui.js
index 37c43c882..a0e595379 100644
--- a/guacamole/src/main/webapp/scripts/client-ui.js
+++ b/guacamole/src/main/webapp/scripts/client-ui.js
@@ -1078,17 +1078,16 @@ GuacUI.Client.attach = function(guac) {
      * Uploads the given file to the server.
      * 
      * @private
-     * @param {Number} index The index of the stream to upload through.
      * @param {File} file The file to upload.
      */
-    function _upload_file(index, file) {
+    function _upload_file(file) {
 
         // Construct reader for file
         var reader = new FileReader();
         reader.onloadend = function() {
 
             // Open file for writing
-            var stream = GuacUI.Client.attachedClient.createFileStream(index, file.type, file.name);
+            var stream = GuacUI.Client.attachedClient.createFileStream(file.type, file.name);
 
             var bytes = new Uint8Array(reader.result);
             var offset = 0;
@@ -1132,7 +1131,7 @@ GuacUI.Client.attach = function(guac) {
         // Upload each file 
         var files = e.dataTransfer.files;
         for (var i=0; i<files.length; i++)
-            _upload_file(i, files[i]);
+            _upload_file(files[i]);
 
     }, false);