diff --git a/src/components/Controls/Datetime.vue b/src/components/Controls/Datetime.vue
index 233d51e4..f7d24526 100644
--- a/src/components/Controls/Datetime.vue
+++ b/src/components/Controls/Datetime.vue
@@ -8,7 +8,7 @@
       <div
         :class="[containerClasses, sizeClasses]"
         class="flex"
-        @click="togglePopover"
+        @click="() => !isReadOnly && togglePopover()"
       >
         <p
           :class="[baseInputClasses]"
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index d9cc4220..ec6c29a6 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -145,7 +145,7 @@ import PageHeader from 'src/components/PageHeader';
 import { fyo } from 'src/initFyo';
 import { docsPathMap } from 'src/utils/misc';
 import { docsPath, openQuickEdit } from 'src/utils/ui';
-import { getMapFromList } from 'utils/index';
+import { getMapFromList, removeAtIndex } from 'utils/index';
 import { nextTick } from 'vue';
 import { handleErrorWithDialog } from '../errorHandling';
 
@@ -175,6 +175,7 @@ export default {
     if (fyo.store.isDevelopment) {
       window.coa = this;
     }
+
     docsPath.value = docsPathMap.ChartOfAccounts;
 
     if (this.refetchTotals) {
@@ -229,13 +230,52 @@ export default {
         return;
       }
 
-      await openQuickEdit({
-        schemaName: ModelNameEnum.Account,
-        name: account.name,
-      });
-
       const doc = await fyo.doc.getDoc(ModelNameEnum.Account, account.name);
-      doc.once('afterDelete', () => this.fetchAccounts());
+      this.setOpenAccountDocListener(doc, account);
+      await openQuickEdit({ doc });
+    },
+    setOpenAccountDocListener(doc, account, parentAccount) {
+      if (doc.hasListener('afterDelete')) {
+        return;
+      }
+
+      doc.once('afterDelete', () => {
+        this.removeAccount(doc.name, account, parentAccount);
+      });
+    },
+    removeAccount(name, account, parentAccount) {
+      if (account == null && parentAccount == null) {
+        return;
+      }
+
+      if (account == null) {
+        account = parentAccount.children.find((ch) => ch.name === name);
+      }
+
+      if (account == null) {
+        return;
+      }
+
+      const indices = account.location.slice(1).map((i) => Number(i));
+
+      let i = Number(account.location[0]);
+      let parent = this.accounts[i];
+      let children = this.accounts[i].children;
+
+      while (indices.length > 1) {
+        i = indices.shift();
+
+        parent = children[i];
+        children = children[i].children;
+      }
+
+      i = indices[0];
+
+      if (children[i].name !== name) {
+        return;
+      }
+
+      parent.children = removeAtIndex(children, i);
     },
     async toggleChildren(account) {
       const hasChildren = await this.fetchChildren(account);
@@ -263,13 +303,7 @@ export default {
         filters: {
           parentAccount: parent,
         },
-        fields: [
-          'name',
-          'parentAccount',
-          'isGroup',
-          'rootType',
-          'accountType',
-        ],
+        fields: ['name', 'parentAccount', 'isGroup', 'rootType', 'accountType'],
         orderBy: 'name',
         order: 'asc',
       });
@@ -307,17 +341,17 @@ export default {
       this.insertingAccount = true;
 
       const accountName = this.newAccountName.trim();
-      let account = await fyo.doc.getNewDoc('Account');
+      const doc = await fyo.doc.getNewDoc('Account');
       try {
         let { name, rootType, accountType } = parentAccount;
-        await account.set({
+        await doc.set({
           name: accountName,
           parentAccount: name,
           rootType,
           accountType,
           isGroup,
         });
-        await account.sync();
+        await doc.sync();
 
         // turn off editing
         parentAccount.addingAccount = 0;
@@ -327,16 +361,16 @@ export default {
         await this.fetchChildren(parentAccount, true);
 
         // open quick edit
-        await openQuickEdit({
-          schemaName: 'Account',
-          name: account.name,
-        });
+        await openQuickEdit({ doc });
+        this.setOpenAccountDocListener(doc, null, parentAccount);
+
         // unfreeze input
         this.insertingAccount = false;
+        this.newAccountName = '';
       } catch (e) {
         // unfreeze input
         this.insertingAccount = false;
-        await handleErrorWithDialog(e, account);
+        await handleErrorWithDialog(e, doc);
       }
     },
     isQuickEditOpen(account) {
@@ -385,19 +419,23 @@ export default {
   },
   computed: {
     allAccounts() {
-      let allAccounts = [];
-      getAccounts(this.accounts, 0);
-      return allAccounts;
+      const allAccounts = [];
+
+      (function getAccounts(accounts, level, location) {
+        for (let i in accounts) {
+          const account = accounts[i];
 
-      function getAccounts(accounts, level) {
-        for (let account of accounts) {
           account.level = level;
+          account.location = [...location, i];
           allAccounts.push(account);
+
           if (account.children != null && account.expanded) {
-            getAccounts(account.children, level + 1);
+            getAccounts(account.children, level + 1, account.location);
           }
         }
-      }
+      })(this.accounts, 0, []);
+
+      return allAccounts;
     },
   },
 };
diff --git a/src/pages/GeneralForm.vue b/src/pages/GeneralForm.vue
index 001f7c6f..bec428a2 100644
--- a/src/pages/GeneralForm.vue
+++ b/src/pages/GeneralForm.vue
@@ -14,10 +14,10 @@
         </p>
         <feather-icon v-else name="more-horizontal" class="w-4 h-4" />
       </DropdownWithActions>
-      <Button v-if="doc.canSave" type="primary" @click="sync">
+      <Button v-if="doc?.canSave" type="primary" @click="sync">
         {{ t`Save` }}
       </Button>
-      <Button v-else-if="doc.canSubmit" type="primary" @click="submit">{{
+      <Button v-else-if="doc?.canSubmit" type="primary" @click="submit">{{
         t`Submit`
       }}</Button>
     </template>
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index d8e48315..0df1f141 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -38,10 +38,10 @@
         </p>
         <feather-icon v-else name="more-horizontal" class="w-4 h-4" />
       </DropdownWithActions>
-      <Button v-if="doc.canSave" type="primary" @click="sync">
+      <Button v-if="doc?.canSave" type="primary" @click="sync">
         {{ t`Save` }}
       </Button>
-      <Button v-else-if="doc.canSubmit" type="primary" @click="submit">{{
+      <Button v-else-if="doc?.canSubmit" type="primary" @click="submit">{{
         t`Submit`
       }}</Button>
     </template>
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index ad03ad01..ceda75a5 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -15,7 +15,7 @@
         <feather-icon v-else name="more-horizontal" class="w-4 h-4" />
       </DropdownWithActions>
       <Button
-        v-if="doc.canSave"
+        v-if="doc?.canSave"
         type="primary"
         class="text-white text-xs"
         @click="sync"
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index 5151fe0b..6fb4648c 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -26,7 +26,7 @@
           :icon="true"
           @click="sync"
           type="primary"
-          v-if="doc.canSave"
+          v-if="doc?.canSave"
           class="text-white text-xs"
         >
           {{ t`Save` }}
@@ -35,7 +35,7 @@
           :icon="true"
           @click="submit"
           type="primary"
-          v-else-if="doc.canSubmit"
+          v-else-if="doc?.canSubmit"
           class="text-white text-xs"
         >
           {{ t`Submit` }}
diff --git a/utils/index.ts b/utils/index.ts
index a367070b..38edb67b 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -217,3 +217,11 @@ export function joinMapLists<A, B>(
 
   return joint;
 }
+
+export function removeAtIndex<T>(array: T[], index: number): T[] {
+  if (index < 0 || index >= array.length) {
+    return array;
+  }
+
+  return [...array.slice(0, index), ...array.slice(index + 1)];
+}