diff --git a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
index dca073a66..126001397 100644
--- a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
+++ b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
@@ -250,7 +250,11 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
 
             // Refresh file browser when any upload completes
             $scope.$on('guacUploadComplete', function uploadComplete(event, filename) {
-                ManagedFilesystem.refresh($scope.filesystem, $scope.filesystem.currentDirectory);
+
+                // Refresh filesystem, if it exists
+                if ($scope.filesystem)
+                    ManagedFilesystem.refresh($scope.filesystem, $scope.filesystem.currentDirectory);
+
             });
 
         }]