diff --git a/src/dispatch/static/dispatch/src/case/type/Table.vue b/src/dispatch/static/dispatch/src/case/type/Table.vue
index 28d7ecb52217..12f34ed2f10d 100644
--- a/src/dispatch/static/dispatch/src/case/type/Table.vue
+++ b/src/dispatch/static/dispatch/src/case/type/Table.vue
@@ -1,6 +1,7 @@
 <template>
   <v-container fluid>
     <new-edit-sheet />
+    <new-template-sheet @new-document-created="addItem($event)" />
     <v-row no-gutters>
       <v-col>
         <v-alert closable icon="mdi-school" prominent text type="info">
@@ -83,6 +84,7 @@ import { mapActions } from "vuex"
 
 import SettingsBreadcrumbs from "@/components/SettingsBreadcrumbs.vue"
 import NewEditSheet from "@/case/type/NewEditSheet.vue"
+import NewTemplateSheet from "@/document/template/TemplateNewEditSheet.vue"
 
 export default {
   name: "CaseTypeTable",
@@ -90,6 +92,7 @@ export default {
   components: {
     NewEditSheet,
     SettingsBreadcrumbs,
+    NewTemplateSheet,
   },
 
   data() {
diff --git a/src/dispatch/static/dispatch/src/document/template/TemplateNewEditSheet.vue b/src/dispatch/static/dispatch/src/document/template/TemplateNewEditSheet.vue
index 8e1563bda3e0..e8b1f2ebaace 100644
--- a/src/dispatch/static/dispatch/src/document/template/TemplateNewEditSheet.vue
+++ b/src/dispatch/static/dispatch/src/document/template/TemplateNewEditSheet.vue
@@ -1,11 +1,6 @@
 <template>
   <v-form @submit.prevent v-slot="{ isValid }">
-    <v-navigation-drawer
-      :model-value="showCreateEdit"
-      @update:model-value="() => {}"
-      location="right"
-      width="500"
-    >
+    <v-navigation-drawer v-model="showCreateEdit" location="right" width="500" absolute temporary>
       <template #prepend>
         <v-list-item lines="two">
           <v-list-item-title v-if="id" class="text-h6"> Edit </v-list-item-title>
diff --git a/src/dispatch/static/dispatch/src/document/template/TemplateSelect.vue b/src/dispatch/static/dispatch/src/document/template/TemplateSelect.vue
index 154e4725cf95..e4a71deb85af 100644
--- a/src/dispatch/static/dispatch/src/document/template/TemplateSelect.vue
+++ b/src/dispatch/static/dispatch/src/document/template/TemplateSelect.vue
@@ -18,7 +18,6 @@
       <v-btn icon variant="text" @click="createEditShow({ resource_type: resourceType })">
         <v-icon>mdi-plus</v-icon>
       </v-btn>
-      <new-edit-sheet @new-document-created="addItem($event)" />
     </template>
     <template #no-data>
       <v-list-item>
@@ -41,7 +40,6 @@ import { mapActions } from "vuex"
 import { cloneDeep } from "lodash"
 
 import DocumentApi from "@/document/api"
-import NewEditSheet from "@/document/template/TemplateNewEditSheet.vue"
 
 export default {
   name: "TemplateSelect",
@@ -73,10 +71,6 @@ export default {
     },
   },
 
-  components: {
-    NewEditSheet,
-  },
-
   data() {
     return {
       loading: false,
diff --git a/src/dispatch/static/dispatch/src/incident/type/Table.vue b/src/dispatch/static/dispatch/src/incident/type/Table.vue
index eaf546c22113..54471de000a9 100644
--- a/src/dispatch/static/dispatch/src/incident/type/Table.vue
+++ b/src/dispatch/static/dispatch/src/incident/type/Table.vue
@@ -1,6 +1,7 @@
 <template>
   <v-container fluid>
     <new-edit-sheet />
+    <new-template-sheet @new-document-created="addItem($event)" />
     <v-row no-gutters>
       <v-col>
         <v-alert closable icon="mdi-school" prominent text type="info">
@@ -74,6 +75,7 @@ import { mapActions } from "vuex"
 
 import NewEditSheet from "@/incident/type/NewEditSheet.vue"
 import SettingsBreadcrumbs from "@/components/SettingsBreadcrumbs.vue"
+import NewTemplateSheet from "@/document/template/TemplateNewEditSheet.vue"
 
 export default {
   name: "IncidentTypeTable",
@@ -81,6 +83,7 @@ export default {
   components: {
     NewEditSheet,
     SettingsBreadcrumbs,
+    NewTemplateSheet,
   },
   data() {
     return {