diff --git a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
index b5138537d..b2318ecb7 100644
--- a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
+++ b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
@@ -171,7 +171,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
      * The set of clients that should be attached to the client UI. This will
      * be immediately initialized by a call to updateAttachedClients() below.
      *
-     * @type ManagedClientGroup[]
+     * @type ManagedClientGroup
      */
     $scope.clientGroup = null;
 
@@ -748,20 +748,20 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
     };
 
     /**
-     * Determines whether the attached client has associated file transfers,
-     * regardless of those file transfers' state.
+     * Determines whether the attached client group has any associated file
+     * transfers, regardless of those file transfers' state.
      *
      * @returns {Boolean}
      *     true if there are any file transfers associated with the
-     *     attached client, false otherise.
+     *     attached client group, false otherise.
      */
     $scope.hasTransfers = function hasTransfers() {
 
-        // There are no file transfers if there is no client
-        if (!$scope.client)
+        // There are no file transfers if there is no client group
+        if (!$scope.clientGroup)
             return false;
 
-        return !!$scope.client.uploads.length;
+        return _.findIndex($scope.clientGroup.clients, ManagedClient.hasTransfers) !== -1;
 
     };
 
diff --git a/guacamole/src/main/frontend/src/app/client/directives/guacFileTransferManager.js b/guacamole/src/main/frontend/src/app/client/directives/guacFileTransferManager.js
index 002494865..3c84e490a 100644
--- a/guacamole/src/main/frontend/src/app/client/directives/guacFileTransferManager.js
+++ b/guacamole/src/main/frontend/src/app/client/directives/guacFileTransferManager.js
@@ -28,12 +28,12 @@ angular.module('client').directive('guacFileTransferManager', [function guacFile
         scope: {
 
             /**
-             * The client whose file transfers should be managed by this
+             * The client group whose file transfers should be managed by this
              * directive.
              * 
-             * @type ManagerClient
+             * @type ManagedClientGroup
              */
-            client : '='
+            clientGroup : '='
 
         },
 
@@ -41,6 +41,8 @@ angular.module('client').directive('guacFileTransferManager', [function guacFile
         controller: ['$scope', '$injector', function guacFileTransferManagerController($scope, $injector) {
 
             // Required types
+            var ManagedClient            = $injector.get('ManagedClient');
+            var ManagedClientGroup       = $injector.get('ManagedClientGroup');
             var ManagedFileTransferState = $injector.get('ManagedFileTransferState');
 
             /**
@@ -74,17 +76,29 @@ angular.module('client').directive('guacFileTransferManager', [function guacFile
              */
             $scope.clearCompletedTransfers = function clearCompletedTransfers() {
 
-                // Nothing to clear if no client attached
-                if (!$scope.client)
+                // Nothing to clear if no client group attached
+                if (!$scope.clientGroup)
                     return;
 
                 // Remove completed uploads
-                $scope.client.uploads = $scope.client.uploads.filter(function isUploadInProgress(upload) {
-                    return isInProgress(upload.transferState);
+                $scope.clientGroup.clients.forEach(client =>  {
+                    client.uploads = client.uploads.filter(function isUploadInProgress(upload) {
+                        return isInProgress(upload.transferState);
+                    });
                 });
 
             };
 
+            /**
+             * @borrows ManagedClientGroup.hasMultipleClients
+             */
+            $scope.hasMultipleClients = ManagedClientGroup.hasMultipleClients;
+
+            /**
+             * @borrows ManagedClient.hasTransfers
+             */
+            $scope.hasTransfers = ManagedClient.hasTransfers;
+
         }]
 
     };
diff --git a/guacamole/src/main/frontend/src/app/client/directives/guacTiledClients.js b/guacamole/src/main/frontend/src/app/client/directives/guacTiledClients.js
index 35b253650..4fcff0277 100644
--- a/guacamole/src/main/frontend/src/app/client/directives/guacTiledClients.js
+++ b/guacamole/src/main/frontend/src/app/client/directives/guacTiledClients.js
@@ -145,18 +145,11 @@ angular.module('client').directive('guacTiledClients', [function guacTiledClient
         };
 
         /**
-         * Returns whether multiple clients are currently shown within the
-         * tiled grid.
-         *
-         * @returns {Boolean}
-         *     true if two or more clients are currently present, false
-         *     otherwise.
+         * @borrows ManagedClientGroup.hasMultipleClients
          */
-        $scope.hasMultipleClients = function hasMultipleClients() {
-            return $scope.clientGroup && $scope.clientGroup.clients.length > 1;
-        };
+        $scope.hasMultipleClients = ManagedClientGroup.hasMultipleClients;
 
-       /**
+        /**
          * Returns the CSS width that should be applied to each tile to
          * achieve an even arrangement.
          *
diff --git a/guacamole/src/main/frontend/src/app/client/styles/transfer-manager.css b/guacamole/src/main/frontend/src/app/client/styles/transfer-manager.css
index 06d0cc841..9b47919c4 100644
--- a/guacamole/src/main/frontend/src/app/client/styles/transfer-manager.css
+++ b/guacamole/src/main/frontend/src/app/client/styles/transfer-manager.css
@@ -36,6 +36,14 @@
     align-items:         center;
 }
 
+.transfer-manager h3 {
+    margin: 0.25em;
+    font-size: 1em;
+    margin-bottom: 0;
+    opacity: 0.5;
+    text-align: center;
+}
+
 .transfer-manager .transfers {
     display: table;
     padding: 0.25em;
diff --git a/guacamole/src/main/frontend/src/app/client/templates/client.html b/guacamole/src/main/frontend/src/app/client/templates/client.html
index 543470e9a..5c92f6652 100644
--- a/guacamole/src/main/frontend/src/app/client/templates/client.html
+++ b/guacamole/src/main/frontend/src/app/client/templates/client.html
@@ -36,7 +36,7 @@
 
     <!-- File transfers -->
     <div id="file-transfer-dialog" ng-show="hasTransfers()">
-        <guac-file-transfer-manager client="client"></guac-file-transfer-manager>
+        <guac-file-transfer-manager client-group="clientGroup"></guac-file-transfer-manager>
     </div>
 
     <!-- Connection stability warning -->
diff --git a/guacamole/src/main/frontend/src/app/client/templates/guacFileTransferManager.html b/guacamole/src/main/frontend/src/app/client/templates/guacFileTransferManager.html
index 2a7dd5ac9..917140311 100644
--- a/guacamole/src/main/frontend/src/app/client/templates/guacFileTransferManager.html
+++ b/guacamole/src/main/frontend/src/app/client/templates/guacFileTransferManager.html
@@ -7,14 +7,12 @@
     </div>
 
     <!-- Sent/received files -->
-    <div class="transfer-manager-body">
+    <div class="transfer-manager-body" ng-repeat="client in clientGroup.clients" ng-show="hasTransfers(client)">
+        <h3 ng-show="hasMultipleClients(clientGroup)">{{ client.name }}</h3>
         <div class="transfers">
             <guac-file-transfer
                 transfer="upload"
                 ng-repeat="upload in client.uploads">
-            </guac-file-transfer><guac-file-transfer
-                transfer="download"
-                ng-repeat="download in client.downloads">
             </guac-file-transfer>
         </div>
     </div>
diff --git a/guacamole/src/main/frontend/src/app/client/templates/guacTiledClients.html b/guacamole/src/main/frontend/src/app/client/templates/guacTiledClients.html
index 933e3d8ee..8a4ac3308 100644
--- a/guacamole/src/main/frontend/src/app/client/templates/guacTiledClients.html
+++ b/guacamole/src/main/frontend/src/app/client/templates/guacTiledClients.html
@@ -1,4 +1,4 @@
-<ul class="tiled-client-list" ng-class="{  'multiple-clients' : hasMultipleClients() }">
+<ul class="tiled-client-list" ng-class="{  'multiple-clients' : hasMultipleClients(clientGroup) }">
 
     <li class="client-tile"
         ng-repeat="client in clientGroup.clients"
diff --git a/guacamole/src/main/frontend/src/app/client/types/ManagedClient.js b/guacamole/src/main/frontend/src/app/client/types/ManagedClient.js
index 6ae30403a..289e2ae3d 100644
--- a/guacamole/src/main/frontend/src/app/client/types/ManagedClient.js
+++ b/guacamole/src/main/frontend/src/app/client/types/ManagedClient.js
@@ -852,6 +852,18 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector',
 
     };
 
+    /**
+     * Returns whether the given client has any associated file transfers,
+     * regardless of those file transfers' state.
+     *
+     * @returns {boolean}
+     *     true if there are any file transfers associated with the
+     *     given client, false otherise.
+     */
+    ManagedClient.hasTransfers = function hasTransfers(client) {
+        return !!(client && client.uploads && client.uploads.length);
+    };
+
     /**
      * Store the thumbnail of the given managed client within the connection
      * history under its associated ID. If the client is not connected, this
diff --git a/guacamole/src/main/frontend/src/app/client/types/ManagedClientGroup.js b/guacamole/src/main/frontend/src/app/client/types/ManagedClientGroup.js
index eb03e98d8..28364477f 100644
--- a/guacamole/src/main/frontend/src/app/client/types/ManagedClientGroup.js
+++ b/guacamole/src/main/frontend/src/app/client/types/ManagedClientGroup.js
@@ -261,6 +261,21 @@ angular.module('client').factory('ManagedClientGroup', ['$injector', function de
         }
     };
 
+    /**
+     * Returns whether the given ManagedClientGroup contains more than one
+     * client.
+     *
+     * @param {ManagedClientGroup} group
+     *     The ManagedClientGroup to test.
+     *
+     * @returns {boolean}
+     *     true if two or more clients are currently present in the given
+     *     group, false otherwise.
+     */
+    ManagedClientGroup.hasMultipleClients = function hasMultipleClients(group) {
+        return group && group.clients.length > 1;
+    };
+
     return ManagedClientGroup;
 
 }]);
\ No newline at end of file