diff --git a/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreController.js b/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreController.js
index 14ddedcf8..4ebec1005 100644
--- a/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreController.js
+++ b/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreController.js
@@ -246,6 +246,10 @@ backupApp.controller('RestoreController', function ($rootScope, $scope, $routePa
                         if (cp.indexOf(compareablePath(sn.Path)) == 0) {
                             var curpath = sn.Path;
                             var parts = p.substr(sn.Path.length).split(dirsep);
+                            // Remove empty part if path had dirsep at end
+                            if (parts[parts.length - 1].length == 0) {
+                                parts.pop();
+                            }
                             var col = sn;
 
                             for(var k in parts) {
@@ -261,6 +265,7 @@ backupApp.controller('RestoreController', function ($rootScope, $scope, $routePa
                                     if (compareablePath(col.Children[m].Path) == compareablePath(curpath)) {
                                         found = true;
                                         col = col.Children[m];
+                                        break;
                                     }
                                 }