diff --git a/src/composables/on-popup-reopen.ts b/src/composables/on-popup-reopen.ts
index 78e39e883..e74e713d0 100644
--- a/src/composables/on-popup-reopen.ts
+++ b/src/composables/on-popup-reopen.ts
@@ -1,13 +1,10 @@
-import { inject, watch } from 'vue';
+import { inject, InjectionKey, watch } from 'vue';
 
 // eslint-disable-next-line
-export const POPUP_TOGGLE_KEY = Symbol();
+export const POPUP_TOGGLE_KEY: InjectionKey<() => boolean> = Symbol();
 
 export function onPopupReopen(callback: () => void) {
-  const popupToggleStatus = inject<(() => boolean) | null>(
-    POPUP_TOGGLE_KEY,
-    null
-  );
+  const popupToggleStatus = inject(POPUP_TOGGLE_KEY, null);
 
   if (popupToggleStatus) {
     watch(popupToggleStatus, (show) => {
diff --git a/src/composables/use-tab-status.ts b/src/composables/use-tab-status.ts
index 319aa8f2c..8a9b37bea 100644
--- a/src/composables/use-tab-status.ts
+++ b/src/composables/use-tab-status.ts
@@ -1,8 +1,8 @@
-import { inject, ComputedRef } from 'vue';
+import { inject, ComputedRef, InjectionKey } from 'vue';
 
 // eslint-disable-next-line
-export const TAB_STATUS_KEY = Symbol();
+export const TAB_STATUS_KEY: InjectionKey<ComputedRef<boolean>> = Symbol();
 
 export function useTabStatus() {
-  return inject<ComputedRef<boolean> | null>(TAB_STATUS_KEY, null);
+  return inject(TAB_STATUS_KEY, null);
 }