diff --git a/AUTHORS b/AUTHORS
index 566c66a15..76c52d31e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,6 +21,7 @@ Emil Hessman <emil@hessman.se>
 Federico Castagnini <federico.castagnini@gmail.com>
 Felix Ableitner <me@nutomic.com>
 Felix Unterpaintner <bigbear2nd@gmail.com>
+Francois-Xavier Gsell <fxgsell@gmail.com>
 Gilli Sigurdsson <gilli@vx.is>
 Jakob Borg <jakob@nym.se>
 James Patterson <jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
diff --git a/gui/scripts/syncthing/core/controllers/syncthingController.js b/gui/scripts/syncthing/core/controllers/syncthingController.js
index f93daa639..4e0a40d91 100644
--- a/gui/scripts/syncthing/core/controllers/syncthingController.js
+++ b/gui/scripts/syncthing/core/controllers/syncthingController.js
@@ -901,6 +901,9 @@ angular.module('syncthing.core')
         $scope.directoryList = [];
 
         $scope.$watch('currentFolder.path', function (newvalue) {
+            if (newvalue && newvalue.trim().charAt(0) == '~') {
+                $scope.currentFolder.path = $scope.system.tilde + newvalue.trim().substring(1)
+            }
             $http.get(urlbase + '/system/browse', {
                 params: { current: newvalue }
             }).success(function (data) {