diff --git a/src/App.vue b/src/App.vue
index 79d686833..9c48735c4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,9 +10,7 @@
 		</no-auth-wrapper>
 		<Notification/>
 
-		<transition name="fade">
-			<keyboard-shortcuts v-if="keyboardShortcutsActive"/>
-		</transition>
+		<keyboard-shortcuts v-if="keyboardShortcutsActive"/>
 	</ready>
 </template>
 
diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue
index e92bc89c2..17d228698 100644
--- a/src/components/home/contentAuth.vue
+++ b/src/components/home/contentAuth.vue
@@ -38,16 +38,14 @@
 					</keep-alive>
 				</router-view>
 
-				<transition name="modal">
-					<modal
-						v-if="currentModal"
-						@close="closeModal()"
-						variant="scrolling"
-						class="task-detail-view-modal"
-					>
-						<component :is="currentModal"/>
-					</modal>
-				</transition>
+				<modal
+					v-if="currentModal"
+					@close="closeModal()"
+					variant="scrolling"
+					class="task-detail-view-modal"
+				>
+					<component :is="currentModal"/>
+				</modal>
 
 				<BaseButton
 					class="keyboard-shortcuts-button d-print-none"
diff --git a/src/components/misc/modal.vue b/src/components/misc/modal.vue
index 188c58bf0..5095b0a72 100644
--- a/src/components/misc/modal.vue
+++ b/src/components/misc/modal.vue
@@ -1,7 +1,7 @@
 <template>
 	<Teleport to="body">
 		<!-- FIXME: transition should not be included in the modal -->
-		<transition name="modal">
+		<transition :name="transitionName">
 			<section
 				v-if="enabled"
 				class="modal-mask"