diff --git a/src/Web/wwwroot/app/vault/vaultAddSiteController.js b/src/Web/wwwroot/app/vault/vaultAddSiteController.js
index c88c30a7677..458d396bef4 100644
--- a/src/Web/wwwroot/app/vault/vaultAddSiteController.js
+++ b/src/Web/wwwroot/app/vault/vaultAddSiteController.js
@@ -37,6 +37,14 @@
             alert('Your web browser does not support easy clipboard copying. Copy it manually instead.');
         };
 
+        $scope.folderSort = function (item) {
+            if (!item.id) {
+                return '';
+            }
+
+            return item.name.toLowerCase();
+        };
+
         function selectPassword(e) {
             var target = $(e.trigger).parent().prev();
             if (target.attr('type') === 'text') {
diff --git a/src/Web/wwwroot/app/vault/vaultEditSiteController.js b/src/Web/wwwroot/app/vault/vaultEditSiteController.js
index aed9e75680e..fe1fc6a31da 100644
--- a/src/Web/wwwroot/app/vault/vaultEditSiteController.js
+++ b/src/Web/wwwroot/app/vault/vaultEditSiteController.js
@@ -38,6 +38,14 @@
             alert('Your web browser does not support easy clipboard copying. Copy it manually instead.');
         };
 
+        $scope.folderSort = function (item) {
+            if (!item.id) {
+                return '';
+            }
+
+            return item.name.toLowerCase();
+        };
+
         function selectPassword(e) {
             var target = $(e.trigger).parent().prev();
             if (target.attr('type') === 'text') {
diff --git a/src/Web/wwwroot/app/vault/views/vaultAddSite.html b/src/Web/wwwroot/app/vault/views/vaultAddSite.html
index 0c178df360b..8f79b730102 100644
--- a/src/Web/wwwroot/app/vault/views/vaultAddSite.html
+++ b/src/Web/wwwroot/app/vault/views/vaultAddSite.html
@@ -34,7 +34,7 @@
                 <div class="form-group" show-errors>
                     <label for="folder">Folder</label>
                     <select id="folder" name="FolderId" ng-model="site.folderId" class="form-control" api-field>
-                        <option ng-repeat="folder in folders" value="{{folder.id}}">{{folder.name}}</option>
+                        <option ng-repeat="folder in folders | orderBy: folderSort" value="{{folder.id}}">{{folder.name}}</option>
                     </select>
                 </div>
             </div>
@@ -95,4 +95,4 @@
         </button>
         <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/Web/wwwroot/app/vault/views/vaultEditSite.html b/src/Web/wwwroot/app/vault/views/vaultEditSite.html
index b7d51d1e0b6..f2f6c3892fe 100644
--- a/src/Web/wwwroot/app/vault/views/vaultEditSite.html
+++ b/src/Web/wwwroot/app/vault/views/vaultEditSite.html
@@ -37,7 +37,7 @@
                 <div class="form-group" show-errors>
                     <label for="folder">Folder</label>
                     <select id="folder" name="FolderId" ng-model="site.folderId" class="form-control" api-field>
-                        <option ng-repeat="folder in folders" value="{{folder.id}}">{{folder.name}}</option>
+                        <option ng-repeat="folder in folders | orderBy: folderSort" value="{{folder.id}}">{{folder.name}}</option>
                     </select>
                 </div>
             </div>
@@ -98,4 +98,4 @@
         </button>
         <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
     </div>
-</form>
\ No newline at end of file
+</form>