diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index 309fa0957d..e9ca5f4580 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -179,7 +179,7 @@ angular.module("umbraco")
             //default root item
             if (!$scope.target) {
 
-               if($scope.lastOpenedNode) {
+               if($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
 
                   entityResource.getById($scope.lastOpenedNode, "media")
                      .then(function(node){
@@ -187,13 +187,15 @@ angular.module("umbraco")
                         // make sure that las opened node is on the same path as start node
                         var nodePath = node.path.split(",");
 
-                        if(nodePath.indexOf($scope.startNodeId) !== -1) {
+                        if(nodePath.indexOf($scope.startNodeId.toString()) !== -1) {
                            $scope.gotoFolder({id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder"});
                         } else {
                            $scope.gotoFolder({id: $scope.startNodeId, name: "Media", icon: "icon-folder"});
                         }
 
-                     });
+                    }, function (err) {
+                        $scope.gotoFolder({id: $scope.startNodeId, name: "Media", icon: "icon-folder"});
+                    });
 
                } else {