From c3be8195fdd1d6f970d035914084872732ef50cc Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 20 Mar 2018 15:58:00 -0400
Subject: [PATCH] no edit/del of "no folder"

---
 src/app/vault/vaultController.js | 8 ++++++++
 src/app/vault/views/vault.html   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
index ee0d6f18b2..47146f80b5 100644
--- a/src/app/vault/vaultController.js
+++ b/src/app/vault/vaultController.js
@@ -243,6 +243,10 @@
         };
 
         $scope.editFolder = function (folder) {
+            if (!folder.id) {
+                return;
+            }
+
             var editModel = $uibModal.open({
                 animation: true,
                 templateUrl: 'app/vault/views/vaultEditFolder.html',
@@ -276,6 +280,10 @@
         };
 
         $scope.deleteFolder = function (folder) {
+            if (!folder.id) {
+                return;
+            }
+
             if (!confirm('Are you sure you want to delete this folder (' + folder.name + ')? ' +
                 'Any items will be moved to "No Folder".')) {
                 return;
diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html
index ca363f7683..eb76be889a 100644
--- a/src/app/vault/views/vault.html
+++ b/src/app/vault/views/vault.html
@@ -50,7 +50,7 @@
                 {{selectedFolder ? selectedFolder.name : selectedCollection ? selectedCollection.name : selectedTitle}}
                 <small ng-pluralize count="filteredCiphers.length" when="{'1': '{} item', 'other': '{} items'}"></small>
             </h3>
-            <div class="box-tools" ng-if="selectedFolder">
+            <div class="box-tools" ng-if="selectedFolder && selectedFolder.id">
                 <div class="btn-group">
                     <button type="button" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown">
                         <i class="fa fa-cog"></i> <span class="caret"></span>