diff --git a/src/popup/app/config.js b/src/popup/app/config.js
index 53480af5e5..94de0519df 100644
--- a/src/popup/app/config.js
+++ b/src/popup/app/config.js
@@ -107,17 +107,14 @@
                 templateUrl: 'app/vault/views/vaultAddSite.html',
                 controller: 'vaultAddSiteController',
                 data: { authorize: true },
-                params: { animation: null, name: null, uri: null, site: null, from: 'vault' }
+                params: { animation: null, name: null, uri: null, folderId: null, site: null, from: 'vault' }
             })
             .state('editSite', {
                 url: '/edit-site?siteId',
                 templateUrl: 'app/vault/views/vaultEditSite.html',
                 controller: 'vaultEditSiteController',
                 data: { authorize: true },
-                params: {
-                    animation: null, fromView: true, returnScrollY: 0,
-                    returnSearchText: null, site: null, from: 'vault'
-                }
+                params: { animation: null, fromView: true, site: null, from: 'vault' }
             })
 
             .state('passwordGenerator', {
diff --git a/src/popup/app/vault/vaultAddSiteController.js b/src/popup/app/vault/vaultAddSiteController.js
index 8ac5620799..3c3e53d0bf 100644
--- a/src/popup/app/vault/vaultAddSiteController.js
+++ b/src/popup/app/vault/vaultAddSiteController.js
@@ -4,10 +4,11 @@
     .controller('vaultAddSiteController', function ($scope, $state, $stateParams, siteService, folderService,
         cryptoService, $q, toastr, utilsService, $analytics, i18nService) {
         $scope.i18n = i18nService;
-        var from = $stateParams.from;
+        var from = $stateParams.from,
+            folderId = $stateParams.folderId;
 
         $scope.site = {
-            folderId: null,
+            folderId: folderId,
             name: $stateParams.name,
             uri: $stateParams.uri
         };
@@ -53,7 +54,8 @@
             }
             else if (from === 'folder') {
                 $state.go('viewFolder', {
-                    animation: 'out-slide-down'
+                    animation: 'out-slide-down',
+                    folderId: folderId
                 });
             }
             else {
diff --git a/src/popup/app/vault/vaultViewFolderController.js b/src/popup/app/vault/vaultViewFolderController.js
index a66513837e..34f683c71c 100644
--- a/src/popup/app/vault/vaultViewFolderController.js
+++ b/src/popup/app/vault/vaultViewFolderController.js
@@ -150,7 +150,8 @@
             storeState();
             $state.go('addSite', {
                 animation: 'in-slide-up',
-                from: 'folder'
+                from: 'folder',
+                folderId: $scope.folder.id
             });
         };