diff --git a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json
index 2ad8048eb..b8846eec1 100644
--- a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json
+++ b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json
@@ -228,6 +228,10 @@
                 {
                     "name"  : "sftp-passphrase",
                     "type"  : "PASSWORD"
+                },
+                {
+                    "name"  : "sftp-directory",
+                    "type"  : "TEXT"
                 }
             ]
         }
diff --git a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json
index a07792487..c134d9f57 100644
--- a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json
+++ b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json
@@ -108,6 +108,10 @@
                 {
                     "name"  : "sftp-passphrase",
                     "type"  : "PASSWORD"
+                },
+                {
+                    "name"  : "sftp-directory",
+                    "type"  : "TEXT"
                 }
             ]
         },
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);
+
             });
 
         }]
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index 355444eb6..8e24f5269 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -281,6 +281,7 @@
         "FIELD_HEADER_REMOTE_APP"      : "Program:",
         "FIELD_HEADER_SECURITY"        : "Security mode:",
         "FIELD_HEADER_SERVER_LAYOUT"   : "Keyboard layout:",
+        "FIELD_HEADER_SFTP_DIRECTORY"   : "Default upload directory:",
         "FIELD_HEADER_SFTP_HOSTNAME"    : "Hostname:",
         "FIELD_HEADER_SFTP_PASSPHRASE"  : "Passphrase:",
         "FIELD_HEADER_SFTP_PASSWORD"    : "Password:",
@@ -423,6 +424,7 @@
         "FIELD_HEADER_PASSWORD"         : "Password:",
         "FIELD_HEADER_PORT"             : "Port:",
         "FIELD_HEADER_READ_ONLY"        : "Read-only:",
+        "FIELD_HEADER_SFTP_DIRECTORY"   : "Default upload directory:",
         "FIELD_HEADER_SFTP_HOSTNAME"    : "Hostname:",
         "FIELD_HEADER_SFTP_PASSPHRASE"  : "Passphrase:",
         "FIELD_HEADER_SFTP_PASSWORD"    : "Password:",