diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index af2261b9..10671974 100644
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -26,11 +26,11 @@
 
 <script lang="ts" setup>
 import { defineAsyncComponent, nextTick, onMounted, provide, ref, watch } from 'vue'
-import { hideOverlay, requireInjection, showOverlay } from '@/utils'
+import { hideOverlay, showOverlay } from '@/utils'
 import { commonStore, preferenceStore as preferences, queueStore } from '@/stores'
 import { authService, socketListener, socketService, uploadService } from '@/services'
-import { CurrentSongKey, DialogBoxKey, MessageToasterKey, RouterKey } from '@/symbols'
-import { useNetworkStatus } from '@/composables'
+import { CurrentSongKey, DialogBoxKey, MessageToasterKey } from '@/symbols'
+import { useNetworkStatus, useRouter } from '@/composables'
 
 import DialogBox from '@/components/ui/DialogBox.vue'
 import MessageToaster from '@/components/ui/MessageToaster.vue'
@@ -62,6 +62,7 @@ const currentSong = ref<Song | null>(null)
 const authenticated = ref(false)
 const showDropZone = ref(false)
 
+const { isCurrentScreen } = useRouter()
 const { offline } = useNetworkStatus()
 
 /**
@@ -115,10 +116,8 @@ const init = async () => {
   }
 }
 
-const router = requireInjection(RouterKey)
-
 const onDragOver = (e: DragEvent) => {
-  showDropZone.value = Boolean(e.dataTransfer?.types.includes('Files')) && router.$currentRoute.value.screen !== 'Upload'
+  showDropZone.value = Boolean(e.dataTransfer?.types.includes('Files')) && !isCurrentScreen('Upload')
 }
 
 watch(() => queueStore.current, song => song && (currentSong.value = song))
diff --git a/resources/assets/js/components/album/AlbumCard.vue b/resources/assets/js/components/album/AlbumCard.vue
index a99cdc57..ad836ce8 100644
--- a/resources/assets/js/components/album/AlbumCard.vue
+++ b/resources/assets/js/components/album/AlbumCard.vue
@@ -42,16 +42,14 @@
 
 <script lang="ts" setup>
 import { computed, toRef, toRefs } from 'vue'
-import { eventBus, requireInjection, secondsToHumanReadable } from '@/utils'
+import { eventBus } from '@/utils'
 import { albumStore, artistStore, commonStore, songStore } from '@/stores'
 import { downloadService, playbackService } from '@/services'
-import { useDraggable } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { useDraggable, useRouter } from '@/composables'
 
 import ArtistAlbumCard from '@/components/ui/ArtistAlbumCard.vue'
 
-const router = requireInjection(RouterKey)
-
+const { go } = useRouter()
 const { startDragging } = useDraggable('album')
 
 const props = withDefaults(defineProps<{ album: Album, layout?: ArtistAlbumCardLayout }>(), { layout: 'full' })
@@ -59,13 +57,12 @@ const { album, layout } = toRefs(props)
 
 const allowDownload = toRef(commonStore.state, 'allow_download')
 
-const duration = computed(() => secondsToHumanReadable(album.value.length))
 const isStandardArtist = computed(() => artistStore.isStandard(album.value.artist_id))
 const showing = computed(() => !albumStore.isUnknown(album.value))
 
 const shuffle = async () => {
   playbackService.queueAndPlay(await songStore.fetchForAlbum(album.value), true /* shuffled */)
-  router.go('queue')
+  go('queue')
 }
 
 const download = () => downloadService.fromAlbum(album.value)
diff --git a/resources/assets/js/components/album/AlbumContextMenu.vue b/resources/assets/js/components/album/AlbumContextMenu.vue
index 3c14c66a..523f6b82 100644
--- a/resources/assets/js/components/album/AlbumContextMenu.vue
+++ b/resources/assets/js/components/album/AlbumContextMenu.vue
@@ -18,12 +18,11 @@
 import { computed, ref, toRef } from 'vue'
 import { albumStore, artistStore, commonStore, songStore } from '@/stores'
 import { downloadService, playbackService } from '@/services'
-import { useContextMenu } from '@/composables'
-import { eventBus, requireInjection } from '@/utils'
-import { RouterKey } from '@/symbols'
+import { useContextMenu, useRouter } from '@/composables'
+import { eventBus } from '@/utils'
 
+const { go } = useRouter()
 const { context, base, ContextMenuBase, open, trigger } = useContextMenu()
-const router = requireInjection(RouterKey)
 
 const album = ref<Album>()
 const allowDownload = toRef(commonStore.state, 'allow_download')
@@ -36,12 +35,12 @@ const isStandardArtist = computed(() => {
 
 const play = () => trigger(async () => {
   playbackService.queueAndPlay(await songStore.fetchForAlbum(album.value!))
-  router.go('queue')
+  go('queue')
 })
 
 const shuffle = () => trigger(async () => {
   playbackService.queueAndPlay(await songStore.fetchForAlbum(album.value!), true)
-  router.go('queue')
+  go('queue')
 })
 
 const viewAlbumDetails = () => trigger(() => router.go(`album/${album.value!.id}`))
diff --git a/resources/assets/js/components/album/AlbumInfo.vue b/resources/assets/js/components/album/AlbumInfo.vue
index 17e20868..3611c670 100644
--- a/resources/assets/js/components/album/AlbumInfo.vue
+++ b/resources/assets/js/components/album/AlbumInfo.vue
@@ -34,26 +34,23 @@
 <script lang="ts" setup>
 import { faCirclePlay } from '@fortawesome/free-solid-svg-icons'
 import { computed, defineAsyncComponent, ref, toRefs, watch } from 'vue'
-import { useThirdPartyServices } from '@/composables'
 import { songStore } from '@/stores'
 import { mediaInfoService, playbackService } from '@/services'
-import { RouterKey } from '@/symbols'
+import { useRouter, useThirdPartyServices } from '@/composables'
 
 import AlbumThumbnail from '@/components/ui/AlbumArtistThumbnail.vue'
-import { requireInjection } from '@/utils'
-
-const router = requireInjection(RouterKey)
 
 const TrackList = defineAsyncComponent(() => import('@/components/album/AlbumTrackList.vue'))
 
 const props = withDefaults(defineProps<{ album: Album, mode?: MediaInfoDisplayMode }>(), { mode: 'aside' })
 const { album, mode } = toRefs(props)
 
+const { go } = useRouter()
+const { useLastfm } = useThirdPartyServices()
+
 const info = ref<AlbumInfo | null>(null)
 const showingFullWiki = ref(false)
 
-const { useLastfm } = useThirdPartyServices()
-
 watch(album, async () => {
   showingFullWiki.value = false
   info.value = null
@@ -65,7 +62,7 @@ const showFull = computed(() => !showSummary.value)
 
 const play = async () => {
   playbackService.queueAndPlay(await songStore.fetchForAlbum(album.value))
-  router.go('queue')
+  go('queue')
 }
 </script>
 
diff --git a/resources/assets/js/components/artist/ArtistCard.vue b/resources/assets/js/components/artist/ArtistCard.vue
index 7ffbdf83..ad637c1e 100644
--- a/resources/assets/js/components/artist/ArtistCard.vue
+++ b/resources/assets/js/components/artist/ArtistCard.vue
@@ -39,16 +39,14 @@
 
 <script lang="ts" setup>
 import { computed, toRef, toRefs } from 'vue'
-import { eventBus, requireInjection } from '@/utils'
+import { eventBus } from '@/utils'
 import { artistStore, commonStore, songStore } from '@/stores'
 import { downloadService, playbackService } from '@/services'
-import { useDraggable } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { useDraggable, useRouter } from '@/composables'
 
 import ArtistAlbumCard from '@/components/ui/ArtistAlbumCard.vue'
 
-const router = requireInjection(RouterKey)
-
+const { go } = useRouter()
 const { startDragging } = useDraggable('artist')
 
 const props = withDefaults(defineProps<{ artist: Artist, layout?: ArtistAlbumCardLayout }>(), { layout: 'full' })
@@ -60,7 +58,7 @@ const showing = computed(() => artistStore.isStandard(artist.value))
 
 const shuffle = async () => {
   playbackService.queueAndPlay(await songStore.fetchForArtist(artist.value), true /* shuffled */)
-  router.go('queue')
+  go('queue')
 }
 
 const download = () => downloadService.fromArtist(artist.value)
diff --git a/resources/assets/js/components/artist/ArtistContextMenu.vue b/resources/assets/js/components/artist/ArtistContextMenu.vue
index 28b0e567..ac9b5de8 100644
--- a/resources/assets/js/components/artist/ArtistContextMenu.vue
+++ b/resources/assets/js/components/artist/ArtistContextMenu.vue
@@ -19,12 +19,11 @@
 import { computed, ref, toRef } from 'vue'
 import { artistStore, commonStore, songStore } from '@/stores'
 import { downloadService, playbackService } from '@/services'
-import { useContextMenu } from '@/composables'
-import { RouterKey } from '@/symbols'
-import { eventBus, requireInjection } from '@/utils'
+import { useContextMenu, useRouter } from '@/composables'
+import { eventBus } from '@/utils'
 
+const { go } = useRouter()
 const { context, base, ContextMenuBase, open, trigger } = useContextMenu()
-const router = requireInjection(RouterKey)
 
 const artist = ref<Artist>()
 const allowDownload = toRef(commonStore.state, 'allow_download')
@@ -36,15 +35,15 @@ const isStandardArtist = computed(() =>
 
 const play = () => trigger(async () => {
   playbackService.queueAndPlay(await songStore.fetchForArtist(artist.value!))
-  router.go('queue')
+  go('queue')
 })
 
 const shuffle = () => trigger(async () => {
   playbackService.queueAndPlay(await songStore.fetchForArtist(artist.value!), true)
-  router.go('queue')
+  go('queue')
 })
 
-const viewArtistDetails = () => trigger(() => router.go(`artist/${artist.value!.id}`))
+const viewArtistDetails = () => trigger(() => go(`artist/${artist.value!.id}`))
 const download = () => trigger(() => downloadService.fromArtist(artist.value!))
 
 eventBus.on('ARTIST_CONTEXT_MENU_REQUESTED', async (e, _artist) => {
diff --git a/resources/assets/js/components/artist/ArtistInfo.vue b/resources/assets/js/components/artist/ArtistInfo.vue
index 5af72d7c..1a98a59a 100644
--- a/resources/assets/js/components/artist/ArtistInfo.vue
+++ b/resources/assets/js/components/artist/ArtistInfo.vue
@@ -33,18 +33,15 @@
 import { faCirclePlay } from '@fortawesome/free-solid-svg-icons'
 import { computed, ref, toRefs, watch } from 'vue'
 import { mediaInfoService, playbackService } from '@/services'
-import { useThirdPartyServices } from '@/composables'
+import { useRouter, useThirdPartyServices } from '@/composables'
 import { songStore } from '@/stores'
-import { RouterKey } from '@/symbols'
-import { requireInjection } from '@/utils'
 
 import ArtistThumbnail from '@/components/ui/AlbumArtistThumbnail.vue'
 
-const router = requireInjection(RouterKey)
-
 const props = withDefaults(defineProps<{ artist: Artist, mode?: MediaInfoDisplayMode }>(), { mode: 'aside' })
 const { artist, mode } = toRefs(props)
 
+const { go } = useRouter()
 const { useLastfm } = useThirdPartyServices()
 
 const info = ref<ArtistInfo | null>(null)
@@ -61,7 +58,7 @@ const showFull = computed(() => !showSummary.value)
 
 const play = async () => {
   playbackService.queueAndPlay(await songStore.fetchForArtist(artist.value))
-  router.go('queue')
+  go('queue')
 }
 </script>
 
diff --git a/resources/assets/js/components/layout/main-wrapper/MainContent.vue b/resources/assets/js/components/layout/main-wrapper/MainContent.vue
index 30a5e119..9d79a0ae 100644
--- a/resources/assets/js/components/layout/main-wrapper/MainContent.vue
+++ b/resources/assets/js/components/layout/main-wrapper/MainContent.vue
@@ -36,8 +36,8 @@
 import { defineAsyncComponent, onMounted, ref, toRef } from 'vue'
 import { requireInjection } from '@/utils'
 import { preferenceStore } from '@/stores'
-import { useThirdPartyServices } from '@/composables'
-import { CurrentSongKey, RouterKey } from '@/symbols'
+import { useRouter, useThirdPartyServices } from '@/composables'
+import { CurrentSongKey } from '@/symbols'
 
 import HomeScreen from '@/components/screens/HomeScreen.vue'
 import QueueScreen from '@/components/screens/QueueScreen.vue'
@@ -64,16 +64,16 @@ const NotFoundScreen = defineAsyncComponent(() => import('@/components/screens/N
 const VisualizerScreen = defineAsyncComponent(() => import('@/components/screens/VisualizerScreen.vue'))
 
 const { useYouTube } = useThirdPartyServices()
+const { resolveRoute, onRouteChanged } = useRouter()
 
-const router = requireInjection(RouterKey)
 const currentSong = requireInjection(CurrentSongKey, ref(null))
 
 const showAlbumArtOverlay = toRef(preferenceStore.state, 'showAlbumArtOverlay')
 const screen = ref<ScreenName>('Home')
 
-router.onRouteChanged(route => (screen.value = route.screen))
+onRouteChanged(route => (screen.value = route.screen))
 
-onMounted(() => router.resolve())
+onMounted(() => resolveRoute())
 </script>
 
 <style lang="scss">
diff --git a/resources/assets/js/components/layout/main-wrapper/Sidebar.vue b/resources/assets/js/components/layout/main-wrapper/Sidebar.vue
index 13ca3ff9..5e36473f 100644
--- a/resources/assets/js/components/layout/main-wrapper/Sidebar.vue
+++ b/resources/assets/js/components/layout/main-wrapper/Sidebar.vue
@@ -98,10 +98,9 @@ import {
 } from '@fortawesome/free-solid-svg-icons'
 import { faYoutube } from '@fortawesome/free-brands-svg-icons'
 import { ref } from 'vue'
-import { eventBus, requireInjection } from '@/utils'
+import { eventBus } from '@/utils'
 import { queueStore } from '@/stores'
-import { useAuthorization, useDroppable, useThirdPartyServices } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { useAuthorization, useDroppable, useRouter, useThirdPartyServices } from '@/composables'
 
 import PlaylistList from '@/components/playlist/PlaylistSidebarList.vue'
 import SearchForm from '@/components/ui/SearchForm.vue'
@@ -110,6 +109,7 @@ const mobileShowing = ref(false)
 const activeScreen = ref<ScreenName>()
 const droppableToQueue = ref(false)
 
+const { onRouteChanged } = useRouter()
 const { acceptsDrop, resolveDroppedSongs } = useDroppable(['songs', 'album', 'artist', 'playlist'])
 const { useYouTube } = useThirdPartyServices()
 const { isAdmin } = useAuthorization()
@@ -138,9 +138,7 @@ const onQueueDrop = async (event: DragEvent) => {
 
 const closeIfMobile = () => (mobileShowing.value = false)
 
-const router = requireInjection(RouterKey)
-
-router.onRouteChanged(route => {
+onRouteChanged(route => {
   mobileShowing.value = false
   activeScreen.value = route.screen
 })
diff --git a/resources/assets/js/components/playlist/CreatePlaylistForm.vue b/resources/assets/js/components/playlist/CreatePlaylistForm.vue
index b42c3a19..094a67f2 100644
--- a/resources/assets/js/components/playlist/CreatePlaylistForm.vue
+++ b/resources/assets/js/components/playlist/CreatePlaylistForm.vue
@@ -30,16 +30,15 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 import { playlistStore } from '@/stores'
-import { logger, requireInjection } from '@/utils'
-import { useDialogBox, useMessageToaster } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { logger } from '@/utils'
+import { useDialogBox, useMessageToaster, useRouter } from '@/composables'
 
 import SoundBars from '@/components/ui/SoundBars.vue'
 import Btn from '@/components/ui/Btn.vue'
 
 const { toastSuccess } = useMessageToaster()
 const { showConfirmDialog, showErrorDialog } = useDialogBox()
-const router = requireInjection(RouterKey)
+const { go } = useRouter()
 
 const loading = ref(false)
 const name = ref('')
@@ -54,7 +53,7 @@ const submit = async () => {
     const playlist = await playlistStore.store(name.value)
     close()
     toastSuccess(`Playlist "${playlist.name}" created.`)
-    router.go(`playlist/${playlist.id}`)
+    go(`playlist/${playlist.id}`)
   } catch (error) {
     showErrorDialog('Something went wrong. Please try again.', 'Error')
     logger.error(error)
diff --git a/resources/assets/js/components/playlist/PlaylistFolderContextMenu.vue b/resources/assets/js/components/playlist/PlaylistFolderContextMenu.vue
index 0a347a4f..23fe41c9 100644
--- a/resources/assets/js/components/playlist/PlaylistFolderContextMenu.vue
+++ b/resources/assets/js/components/playlist/PlaylistFolderContextMenu.vue
@@ -14,15 +14,14 @@
 
 <script lang="ts" setup>
 import { computed, ref } from 'vue'
-import { useContextMenu } from '@/composables'
-import { eventBus, requireInjection } from '@/utils'
+import { eventBus } from '@/utils'
 import { playlistStore, songStore } from '@/stores'
 import { playbackService } from '@/services'
-import { RouterKey } from '@/symbols'
+import { useContextMenu, useRouter } from '@/composables'
 
+const { go } = useRouter()
 const { context, base, ContextMenuBase, open, trigger } = useContextMenu()
 
-const router = requireInjection(RouterKey)
 const folder = ref<PlaylistFolder>()
 
 const playlistsInFolder = computed(() => folder.value ? playlistStore.byFolder(folder.value) : [])
@@ -30,12 +29,12 @@ const playable = computed(() => playlistsInFolder.value.length > 0)
 
 const play = () => trigger(async () => {
   playbackService.queueAndPlay(await songStore.fetchForPlaylistFolder(folder.value!))
-  router.go('queue')
+  go('queue')
 })
 
 const shuffle = () => trigger(async () => {
   playbackService.queueAndPlay(await songStore.fetchForPlaylistFolder(folder.value!), true)
-  router.go('queue')
+  go('queue')
 })
 
 const rename = () => trigger(() => eventBus.emit('MODAL_SHOW_EDIT_PLAYLIST_FOLDER_FORM', folder.value))
diff --git a/resources/assets/js/components/playlist/PlaylistSidebarItem.vue b/resources/assets/js/components/playlist/PlaylistSidebarItem.vue
index 6cc7d6e4..a52cd9e5 100644
--- a/resources/assets/js/components/playlist/PlaylistSidebarItem.vue
+++ b/resources/assets/js/components/playlist/PlaylistSidebarItem.vue
@@ -30,15 +30,14 @@
 <script lang="ts" setup>
 import { faBoltLightning, faClockRotateLeft, faFile, faHeart, faMusic } from '@fortawesome/free-solid-svg-icons'
 import { computed, ref, toRefs } from 'vue'
-import { eventBus, requireInjection } from '@/utils'
+import { eventBus } from '@/utils'
 import { favoriteStore } from '@/stores'
-import { RouterKey } from '@/symbols'
-import { useDraggable, useDroppable, usePlaylistManagement } from '@/composables'
+import { useDraggable, useDroppable, usePlaylistManagement, useRouter } from '@/composables'
 
+const { onRouteChanged } = useRouter()
 const { startDragging } = useDraggable('playlist')
 const { acceptsDrop, resolveDroppedSongs } = useDroppable(['songs', 'album', 'artist'])
 
-const router = requireInjection(RouterKey)
 const droppable = ref(false)
 
 const { addSongsToPlaylist } = usePlaylistManagement()
@@ -108,7 +107,7 @@ const onDrop = async (event: DragEvent) => {
   return false
 }
 
-router.onRouteChanged(route => {
+onRouteChanged(route => {
   switch (route.screen) {
     case 'Favorites':
       active.value = isFavoriteList(list.value)
diff --git a/resources/assets/js/components/playlist/smart-playlist/CreateSmartPlaylistForm.vue b/resources/assets/js/components/playlist/smart-playlist/CreateSmartPlaylistForm.vue
index 4a146fca..764d7016 100644
--- a/resources/assets/js/components/playlist/smart-playlist/CreateSmartPlaylistForm.vue
+++ b/resources/assets/js/components/playlist/smart-playlist/CreateSmartPlaylistForm.vue
@@ -40,9 +40,8 @@
 import { faPlus } from '@fortawesome/free-solid-svg-icons'
 import { ref } from 'vue'
 import { playlistStore } from '@/stores'
-import { logger, requireInjection } from '@/utils'
-import { useDialogBox, useMessageToaster, useSmartPlaylistForm } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { logger } from '@/utils'
+import { useDialogBox, useMessageToaster, useRouter, useSmartPlaylistForm } from '@/composables'
 
 const {
   Btn,
@@ -57,7 +56,7 @@ const {
 
 const { toastSuccess } = useMessageToaster()
 const { showConfirmDialog, showErrorDialog } = useDialogBox()
-const router = requireInjection(RouterKey)
+const { go } = useRouter()
 
 const name = ref('')
 
@@ -80,7 +79,7 @@ const submit = async () => {
     const playlist = await playlistStore.store(name.value, [], collectedRuleGroups.value)
     close()
     toastSuccess(`Playlist "${playlist.name}" created.`)
-    router.go(`playlist/${playlist.id}`)
+    go(`playlist/${playlist.id}`)
   } catch (error) {
     showErrorDialog('Something went wrong. Please try again.')
     logger.error(error)
diff --git a/resources/assets/js/components/screens/AlbumScreen.vue b/resources/assets/js/components/screens/AlbumScreen.vue
index 7ef8bbc9..b92096a3 100644
--- a/resources/assets/js/components/screens/AlbumScreen.vue
+++ b/resources/assets/js/components/screens/AlbumScreen.vue
@@ -88,11 +88,10 @@
 
 <script lang="ts" setup>
 import { computed, defineAsyncComponent, onMounted, ref, toRef, watch } from 'vue'
-import { eventBus, logger, pluralize, requireInjection } from '@/utils'
+import { eventBus, logger, pluralize } from '@/utils'
 import { albumStore, artistStore, commonStore, songStore } from '@/stores'
 import { downloadService } from '@/services'
-import { useDialogBox, useSongList } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { useDialogBox, useRouter, useSongList } from '@/composables'
 
 import ScreenHeader from '@/components/ui/ScreenHeader.vue'
 import AlbumThumbnail from '@/components/ui/AlbumArtistThumbnail.vue'
@@ -108,7 +107,7 @@ const AlbumCard = defineAsyncComponent(() => import('@/components/album/AlbumCar
 const AlbumCardSkeleton = defineAsyncComponent(() => import('@/components/ui/skeletons/ArtistAlbumCardSkeleton.vue'))
 
 const { showErrorDialog } = useDialogBox()
-const router = requireInjection(RouterKey)
+const { getRouteParam, go, onRouteChanged } = useRouter()
 
 const albumId = ref<number>()
 const album = ref<Album>()
@@ -175,12 +174,12 @@ watch(albumId, async id => {
   }
 })
 
-onMounted(async () => (albumId.value = parseInt(router.$currentRoute.value.params!.id)))
+onMounted(async () => (albumId.value = parseInt(getRouteParam('id')!)))
 
-router.onRouteChanged(route => route.screen === 'Album' && (albumId.value = parseInt(route.params!.id)))
+onRouteChanged(route => route.screen === 'Album' && (albumId.value = parseInt(getRouteParam('id')!)))
 
 // if the current album has been deleted, go back to the list
-eventBus.on('SONGS_UPDATED', () => albumStore.byId(albumId.value) || router.go('albums'))
+eventBus.on('SONGS_UPDATED', () => albumStore.byId(albumId.value) || go('albums'))
 </script>
 
 <style lang="scss" scoped>
diff --git a/resources/assets/js/components/screens/AllSongsScreen.vue b/resources/assets/js/components/screens/AllSongsScreen.vue
index dfc645c4..eb2f20ce 100644
--- a/resources/assets/js/components/screens/AllSongsScreen.vue
+++ b/resources/assets/js/components/screens/AllSongsScreen.vue
@@ -36,11 +36,10 @@
 
 <script lang="ts" setup>
 import { computed, ref, toRef } from 'vue'
-import { logger, pluralize, requireInjection, secondsToHumanReadable } from '@/utils'
+import { logger, pluralize, secondsToHumanReadable } from '@/utils'
 import { commonStore, queueStore, songStore } from '@/stores'
 import { playbackService } from '@/services'
-import { useMessageToaster, useScreen, useSongList } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { useMessageToaster, useRouter, useScreen, useSongList } from '@/composables'
 
 import ScreenHeader from '@/components/ui/ScreenHeader.vue'
 import SongListSkeleton from '@/components/ui/skeletons/SongListSkeleton.vue'
@@ -66,7 +65,7 @@ const {
 } = useSongList(toRef(songStore.state, 'songs'))
 
 const { toastError } = useMessageToaster()
-const router = requireInjection(RouterKey)
+const { go } = useRouter()
 
 let initialized = false
 const loading = ref(false)
@@ -108,7 +107,7 @@ const playAll = async (shuffle: boolean) => {
     await queueStore.fetchInOrder(sortField, sortOrder)
   }
 
-  router.go('queue')
+  go('queue')
   await playbackService.playFirstInQueue()
 }
 
diff --git a/resources/assets/js/components/screens/ArtistScreen.vue b/resources/assets/js/components/screens/ArtistScreen.vue
index ddc87642..8d222c26 100644
--- a/resources/assets/js/components/screens/ArtistScreen.vue
+++ b/resources/assets/js/components/screens/ArtistScreen.vue
@@ -85,11 +85,10 @@
 
 <script lang="ts" setup>
 import { computed, defineAsyncComponent, onMounted, ref, toRef, watch } from 'vue'
-import { eventBus, logger, pluralize, requireInjection } from '@/utils'
+import { eventBus, logger, pluralize } from '@/utils'
 import { albumStore, artistStore, commonStore, songStore } from '@/stores'
 import { downloadService } from '@/services'
-import { useDialogBox, useSongList, useThirdPartyServices } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { useDialogBox, useRouter, useSongList, useThirdPartyServices } from '@/composables'
 
 import ScreenHeader from '@/components/ui/ScreenHeader.vue'
 import ArtistThumbnail from '@/components/ui/AlbumArtistThumbnail.vue'
@@ -105,7 +104,7 @@ type Tab = 'Songs' | 'Albums' | 'Info'
 const activeTab = ref<Tab>('Songs')
 
 const { showErrorDialog } = useDialogBox()
-const router = requireInjection(RouterKey)
+const { getRouteParam, go } = useRouter()
 
 const artistId = ref<number>()
 const artist = ref<Artist>()
@@ -165,10 +164,10 @@ watch(artistId, async id => {
 
 const download = () => downloadService.fromArtist(artist.value!)
 
-onMounted(() => (artistId.value = parseInt(router.$currentRoute.value.params!.id)))
+onMounted(() => (artistId.value = parseInt(getRouteParam('id')!)))
 
 // if the current artist has been deleted, go back to the list
-eventBus.on('SONGS_UPDATED', () => artistStore.byId(artist.value!.id) || router.go('artists'))
+eventBus.on('SONGS_UPDATED', () => artistStore.byId(artist.value!.id) || go('artists'))
 </script>
 
 <style lang="scss" scoped>
diff --git a/resources/assets/js/components/screens/GenreScreen.vue b/resources/assets/js/components/screens/GenreScreen.vue
index e5f8cabf..decefaf6 100644
--- a/resources/assets/js/components/screens/GenreScreen.vue
+++ b/resources/assets/js/components/screens/GenreScreen.vue
@@ -42,11 +42,10 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref, watch } from 'vue'
 import { faTags } from '@fortawesome/free-solid-svg-icons'
-import { eventBus, logger, pluralize, requireInjection, secondsToHumanReadable } from '@/utils'
+import { eventBus, logger, pluralize, secondsToHumanReadable } from '@/utils'
 import { playbackService } from '@/services'
 import { genreStore, songStore } from '@/stores'
-import { useDialogBox, useSongList } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { useDialogBox, useRouter, useSongList } from '@/composables'
 
 import ScreenHeader from '@/components/ui/ScreenHeader.vue'
 import ScreenEmptyState from '@/components/ui/ScreenEmptyState.vue'
@@ -70,7 +69,7 @@ const {
 } = useSongList(ref<Song[]>([]))
 
 const { showErrorDialog } = useDialogBox()
-const router = requireInjection(RouterKey)
+const { getRouteParam, go, onRouteChanged } = useRouter()
 
 let sortField: SongListSortField = 'title'
 let sortOrder: SortOrder = 'asc'
@@ -125,9 +124,9 @@ const refresh = async () => {
   await fetch()
 }
 
-const getNameFromRoute = () => router.$currentRoute.value.params?.name || null
+const getNameFromRoute = () => getRouteParam('name') ?? null
 
-router.onRouteChanged(route => {
+onRouteChanged(route => {
   if (route.screen !== 'Genre') return
   name.value = getNameFromRoute()
 })
@@ -142,7 +141,7 @@ const playAll = async () => {
     playbackService.queueAndPlay(await songStore.fetchRandomForGenre(genre.value!, randomSongCount))
   }
 
-  router.go('queue')
+  go('queue')
 }
 
 onMounted(() => (name.value = getNameFromRoute()))
diff --git a/resources/assets/js/components/screens/PlaylistScreen.vue b/resources/assets/js/components/screens/PlaylistScreen.vue
index 83f59563..f4fa22b0 100644
--- a/resources/assets/js/components/screens/PlaylistScreen.vue
+++ b/resources/assets/js/components/screens/PlaylistScreen.vue
@@ -67,17 +67,16 @@
 import { faFile } from '@fortawesome/free-regular-svg-icons'
 import { differenceBy } from 'lodash'
 import { ref, toRef, watch } from 'vue'
-import { eventBus, pluralize, requireInjection } from '@/utils'
+import { eventBus, pluralize } from '@/utils'
 import { commonStore, playlistStore, songStore } from '@/stores'
 import { downloadService } from '@/services'
-import { usePlaylistManagement, useSongList } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { usePlaylistManagement, useRouter, useSongList } from '@/composables'
 
 import ScreenHeader from '@/components/ui/ScreenHeader.vue'
 import ScreenEmptyState from '@/components/ui/ScreenEmptyState.vue'
 import SongListSkeleton from '@/components/ui/skeletons/SongListSkeleton.vue'
 
-const router = requireInjection(RouterKey)
+const { onRouteChanged, triggerNotFound } = useRouter()
 
 const playlistId = ref<number>()
 const playlist = ref<Playlist>()
@@ -129,10 +128,10 @@ watch(playlistId, async id => {
   if (!id) return
 
   playlist.value = playlistStore.byId(id)
-  playlist.value ? await fetchSongs() : await router.triggerNotFound()
+  playlist.value ? await fetchSongs() : await triggerNotFound()
 })
 
-router.onRouteChanged(route => route.screen === 'Playlist' && (playlistId.value = parseInt(route.params!.id)))
+onRouteChanged(route => route.screen === 'Playlist' && (playlistId.value = parseInt(route.params!.id)))
 
 eventBus.on('PLAYLIST_UPDATED', async updated => updated.id === playlistId.value && await fetchSongs())
   .on('PLAYLIST_SONGS_REMOVED', async (playlist, removed) => {
diff --git a/resources/assets/js/components/screens/QueueScreen.vue b/resources/assets/js/components/screens/QueueScreen.vue
index 45645962..7322ad8d 100644
--- a/resources/assets/js/components/screens/QueueScreen.vue
+++ b/resources/assets/js/components/screens/QueueScreen.vue
@@ -51,17 +51,16 @@
 <script lang="ts" setup>
 import { faCoffee } from '@fortawesome/free-solid-svg-icons'
 import { computed, ref, toRef } from 'vue'
-import { eventBus, logger, pluralize, requireInjection } from '@/utils'
+import { eventBus, logger, pluralize } from '@/utils'
 import { commonStore, queueStore, songStore } from '@/stores'
 import { playbackService } from '@/services'
-import { useDialogBox, useSongList } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { useDialogBox, useRouter, useSongList } from '@/composables'
 
 import ScreenHeader from '@/components/ui/ScreenHeader.vue'
 import ScreenEmptyState from '@/components/ui/ScreenEmptyState.vue'
 import SongListSkeleton from '@/components/ui/skeletons/SongListSkeleton.vue'
 
-const router = requireInjection(RouterKey)
+const { go } = useRouter()
 const { showErrorDialog } = useDialogBox()
 
 const controlConfig: Partial<SongListControlsConfig> = { clearQueue: true }
@@ -88,7 +87,7 @@ const libraryNotEmpty = computed(() => commonStore.state.song_count > 0)
 
 const playAll = async (shuffle = true) => {
   playbackService.queueAndPlay(songs.value, shuffle)
-  router.go('queue')
+  go('queue')
 }
 
 const shuffleSome = async () => {
diff --git a/resources/assets/js/components/screens/SettingsScreen.vue b/resources/assets/js/components/screens/SettingsScreen.vue
index 8b3e0fd8..bd6a6dca 100644
--- a/resources/assets/js/components/screens/SettingsScreen.vue
+++ b/resources/assets/js/components/screens/SettingsScreen.vue
@@ -31,16 +31,15 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue'
 import { settingStore } from '@/stores'
-import { forceReloadWindow, hideOverlay, parseValidationError, requireInjection, showOverlay } from '@/utils'
-import { useDialogBox, useMessageToaster } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { forceReloadWindow, hideOverlay, parseValidationError, showOverlay } from '@/utils'
+import { useDialogBox, useMessageToaster, useRouter } from '@/composables'
 
 import ScreenHeader from '@/components/ui/ScreenHeader.vue'
 import Btn from '@/components/ui/Btn.vue'
 
 const { toastSuccess } = useMessageToaster()
 const { showConfirmDialog, showErrorDialog } = useDialogBox()
-const router = requireInjection(RouterKey)
+const { go } = useRouter()
 
 const mediaPath = ref(settingStore.state.media_path)
 const originalMediaPath = mediaPath.value
@@ -61,7 +60,7 @@ const save = async () => {
     await settingStore.update({ media_path: mediaPath.value })
     toastSuccess('Settings saved.')
     // Make sure we're back to home first.
-    router.go('home')
+    go('home')
     forceReloadWindow()
   } catch (err: any) {
     const msg = err.response.status === 422 ? parseValidationError(err.response.data)[0] : 'Unknown error.'
diff --git a/resources/assets/js/components/screens/home/RecentlyPlayedSongs.vue b/resources/assets/js/components/screens/home/RecentlyPlayedSongs.vue
index cc57513b..4fcffbdb 100644
--- a/resources/assets/js/components/screens/home/RecentlyPlayedSongs.vue
+++ b/resources/assets/js/components/screens/home/RecentlyPlayedSongs.vue
@@ -33,19 +33,18 @@
 <script lang="ts" setup>
 import { toRef, toRefs } from 'vue'
 import { overviewStore } from '@/stores'
-import { RouterKey } from '@/symbols'
-import { requireInjection } from '@/utils'
+import { useRouter } from '@/composables'
 
 import Btn from '@/components/ui/Btn.vue'
 import SongCard from '@/components/song/SongCard.vue'
 import SongCardSkeleton from '@/components/ui/skeletons/SongCardSkeleton.vue'
 
-const router = requireInjection(RouterKey)
+const { go } = useRouter()
 
 const props = withDefaults(defineProps<{ loading?: boolean }>(), { loading: false })
 const { loading } = toRefs(props)
 
 const songs = toRef(overviewStore.state, 'recentlyPlayed')
 
-const goToRecentlyPlayedScreen = () => router.go('recently-played')
+const goToRecentlyPlayedScreen = () => go('recently-played')
 </script>
diff --git a/resources/assets/js/components/screens/search/SearchExcerptsScreen.vue b/resources/assets/js/components/screens/search/SearchExcerptsScreen.vue
index 02f823a7..6e2ed49b 100644
--- a/resources/assets/js/components/screens/search/SearchExcerptsScreen.vue
+++ b/resources/assets/js/components/screens/search/SearchExcerptsScreen.vue
@@ -86,9 +86,9 @@
 import { faSearch } from '@fortawesome/free-solid-svg-icons'
 import { intersectionBy } from 'lodash'
 import { ref, toRef } from 'vue'
-import { eventBus, requireInjection } from '@/utils'
+import { eventBus } from '@/utils'
 import { searchStore } from '@/stores'
-import { RouterKey } from '@/symbols'
+import { useRouter } from '@/composables'
 
 import ScreenHeader from '@/components/ui/ScreenHeader.vue'
 import ScreenEmptyState from '@/components/ui/ScreenEmptyState.vue'
@@ -99,13 +99,13 @@ import SongCard from '@/components/song/SongCard.vue'
 import SongCardSkeleton from '@/components/ui/skeletons/SongCardSkeleton.vue'
 import ArtistAlbumCardSkeleton from '@/components/ui/skeletons/ArtistAlbumCardSkeleton.vue'
 
-const router = requireInjection(RouterKey)
+const { go } = useRouter()
 
 const excerpt = toRef(searchStore.state, 'excerpt')
 const q = ref('')
 const searching = ref(false)
 
-const goToSongResults = () => router.go(`search/songs/?q=${q.value}`)
+const goToSongResults = () => go(`search/songs/?q=${q.value}`)
 
 const doSearch = async () => {
   searching.value = true
diff --git a/resources/assets/js/components/screens/search/SearchSongResultsScreen.vue b/resources/assets/js/components/screens/search/SearchSongResultsScreen.vue
index 12ebd7cf..75101a0d 100644
--- a/resources/assets/js/components/screens/search/SearchSongResultsScreen.vue
+++ b/resources/assets/js/components/screens/search/SearchSongResultsScreen.vue
@@ -30,14 +30,13 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref, toRef } from 'vue'
 import { searchStore } from '@/stores'
-import { useSongList } from '@/composables'
-import { pluralize, requireInjection } from '@/utils'
-import { RouterKey } from '@/symbols'
+import { useRouter, useSongList } from '@/composables'
+import { pluralize } from '@/utils'
 
 import ScreenHeader from '@/components/ui/ScreenHeader.vue'
 import SongListSkeleton from '@/components/ui/skeletons/SongListSkeleton.vue'
 
-const router = requireInjection(RouterKey)
+const { getRouteParam } = useRouter()
 const q = ref('')
 
 const {
@@ -65,7 +64,7 @@ const loading = ref(false)
 searchStore.resetSongResultState()
 
 onMounted(async () => {
-  q.value = router.$currentRoute.value.params?.q || ''
+  q.value = getRouteParam('q') || ''
   if (!q.value) return
 
   loading.value = true
diff --git a/resources/assets/js/components/song/AddToMenu.vue b/resources/assets/js/components/song/AddToMenu.vue
index 26dc04a8..aec655c3 100644
--- a/resources/assets/js/components/song/AddToMenu.vue
+++ b/resources/assets/js/components/song/AddToMenu.vue
@@ -68,15 +68,14 @@
 
 <script lang="ts" setup>
 import { computed, nextTick, ref, toRef, toRefs, watch } from 'vue'
-import { pluralize, requireInjection } from '@/utils'
+import { pluralize } from '@/utils'
 import { playlistStore, queueStore } from '@/stores'
-import { useMessageToaster, useSongMenuMethods } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { useMessageToaster, useRouter, useSongMenuMethods } from '@/composables'
 
 import Btn from '@/components/ui/Btn.vue'
 
 const { toastSuccess } = useMessageToaster()
-const router = requireInjection(RouterKey)
+const { go } = useRouter()
 
 const props = defineProps<{ songs: Song[], config: AddToMenuConfig }>()
 const { songs, config } = toRefs(props)
@@ -119,7 +118,7 @@ const createNewPlaylistFromSongs = async () => {
 
   // Activate the new playlist right away
   await nextTick()
-  router.go(`playlist/${playlist.id}`)
+  go(`playlist/${playlist.id}`)
 
   close()
 }
diff --git a/resources/assets/js/components/song/SongContextMenu.vue b/resources/assets/js/components/song/SongContextMenu.vue
index 9915efdc..d3a44546 100644
--- a/resources/assets/js/components/song/SongContextMenu.vue
+++ b/resources/assets/js/components/song/SongContextMenu.vue
@@ -56,7 +56,7 @@
 
 <script lang="ts" setup>
 import { computed, ref, toRef } from 'vue'
-import { arrayify, copyText, eventBus, pluralize, requireInjection } from '@/utils'
+import { arrayify, copyText, eventBus, pluralize } from '@/utils'
 import { commonStore, favoriteStore, playlistStore, queueStore, songStore, userStore } from '@/stores'
 import { downloadService, playbackService } from '@/services'
 import {
@@ -65,13 +65,13 @@ import {
   useDialogBox,
   useMessageToaster,
   usePlaylistManagement,
+  useRouter,
   useSongMenuMethods
 } from '@/composables'
-import { RouterKey } from '@/symbols'
 
 const { toastSuccess } = useMessageToaster()
 const { showConfirmDialog } = useDialogBox()
-const router = requireInjection(RouterKey)
+const { go, getRouteParam, isCurrentScreen } = useRouter()
 
 const songs = ref<Song[]>([])
 
@@ -98,13 +98,13 @@ const firstSongPlaying = computed(() => songs.value.length ? songs.value[0].play
 const normalPlaylists = computed(() => playlists.value.filter(playlist => !playlist.is_smart))
 
 const canBeRemovedFromPlaylist = computed(() => {
-  if (router.$currentRoute.value.screen !== 'Playlist') return false
-  const playlist = playlistStore.byId(parseInt(router.$currentRoute.value.params!.id))
+  if (!isCurrentScreen('Playlist')) return false
+  const playlist = playlistStore.byId(parseInt(getRouteParam('id')!))
   return playlist && !playlist.is_smart
 })
 
-const isQueueScreen = computed(() => router.$currentRoute.value.screen === 'Queue')
-const isFavoritesScreen = computed(() => router.$currentRoute.value.screen === 'Favorites')
+const isQueueScreen = computed(() => isCurrentScreen('Queue'))
+const isFavoritesScreen = computed(() => isCurrentScreen('Favorites'))
 
 const doPlayback = () => trigger(() => {
   if (!songs.value.length) return
@@ -126,12 +126,12 @@ const doPlayback = () => trigger(() => {
 })
 
 const openEditForm = () => trigger(() => songs.value.length && eventBus.emit('MODAL_SHOW_EDIT_SONG_FORM', songs.value))
-const viewAlbumDetails = (albumId: number) => trigger(() => router.go(`album/${albumId}`))
-const viewArtistDetails = (artistId: number) => trigger(() => router.go(`artist/${artistId}`))
+const viewAlbumDetails = (albumId: number) => trigger(() => go(`album/${albumId}`))
+const viewArtistDetails = (artistId: number) => trigger(() => go(`artist/${artistId}`))
 const download = () => trigger(() => downloadService.fromSongs(songs.value))
 
 const removeFromPlaylist = () => trigger(async () => {
-  const playlist = playlistStore.byId(parseInt(router.$currentRoute.value.params!.id))
+  const playlist = playlistStore.byId(parseInt(getRouteParam('id')!))
   if (!playlist) return
 
   await removeSongsFromPlaylist(playlist, songs.value)
diff --git a/resources/assets/js/components/ui/AlbumArtistThumbnail.vue b/resources/assets/js/components/ui/AlbumArtistThumbnail.vue
index 8adb71b4..8c27b59f 100644
--- a/resources/assets/js/components/ui/AlbumArtistThumbnail.vue
+++ b/resources/assets/js/components/ui/AlbumArtistThumbnail.vue
@@ -27,14 +27,13 @@ import { orderBy } from 'lodash'
 import { computed, ref, toRef, toRefs } from 'vue'
 import { albumStore, artistStore, queueStore, songStore, userStore } from '@/stores'
 import { playbackService } from '@/services'
-import { defaultCover, fileReader, logger, requireInjection } from '@/utils'
-import { useAuthorization, useMessageToaster } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { defaultCover, fileReader, logger } from '@/utils'
+import { useAuthorization, useMessageToaster, useRouter } from '@/composables'
 
 const VALID_IMAGE_TYPES = ['image/jpeg', 'image/gif', 'image/png', 'image/webp']
 
 const { toastSuccess } = useMessageToaster()
-const router = requireInjection(RouterKey)
+const { go } = useRouter()
 
 const props = defineProps<{ entity: Album | Artist }>()
 const { entity } = toRefs(props)
@@ -70,7 +69,7 @@ const playOrQueue = async (event: KeyboardEvent) => {
   }
 
   playbackService.queueAndPlay(songs)
-  router.go('queue')
+  go('queue')
 }
 
 const onDragEnter = () => (droppable.value = allowsUpload.value)
diff --git a/resources/assets/js/components/ui/FooterPlayButton.vue b/resources/assets/js/components/ui/FooterPlayButton.vue
index 13780a0e..e40c8206 100644
--- a/resources/assets/js/components/ui/FooterPlayButton.vue
+++ b/resources/assets/js/components/ui/FooterPlayButton.vue
@@ -11,9 +11,10 @@ import { computed, ref } from 'vue'
 import { playbackService } from '@/services'
 import { commonStore, favoriteStore, queueStore, recentlyPlayedStore, songStore } from '@/stores'
 import { requireInjection } from '@/utils'
-import { CurrentSongKey, RouterKey } from '@/symbols'
+import { useRouter } from '@/composables'
+import { CurrentSongKey } from '@/symbols'
 
-const router = requireInjection(RouterKey)
+const { getCurrentScreen, getRouteParam, go } = useRouter()
 const song = requireInjection(CurrentSongKey, ref(null))
 
 const libraryEmpty = computed(() => commonStore.state.song_count === 0)
@@ -26,15 +27,15 @@ const initiatePlayback = async () => {
 
   let songs: Song[]
 
-  switch (router.$currentRoute.value.screen) {
+  switch (getCurrentScreen()) {
     case 'Album':
-      songs = await songStore.fetchForAlbum(parseInt(router.$currentRoute.value.params!.id))
+      songs = await songStore.fetchForAlbum(parseInt(getRouteParam('id')!))
       break
     case 'Artist':
-      songs = await songStore.fetchForArtist(parseInt(router.$currentRoute.value.params!.id))
+      songs = await songStore.fetchForArtist(parseInt(getRouteParam('id')!))
       break
     case 'Playlist':
-      songs = await songStore.fetchForPlaylist(parseInt(router.$currentRoute.value.params!.id))
+      songs = await songStore.fetchForPlaylist(parseInt(getRouteParam('id')!))
       break
     case 'Favorites':
       songs = await favoriteStore.fetch()
@@ -48,7 +49,7 @@ const initiatePlayback = async () => {
   }
 
   playbackService.queueAndPlay(songs)
-  router.go('queue')
+  go('queue')
 }
 </script>
 
diff --git a/resources/assets/js/components/ui/SearchForm.vue b/resources/assets/js/components/ui/SearchForm.vue
index d5d49423..37f805b9 100644
--- a/resources/assets/js/components/ui/SearchForm.vue
+++ b/resources/assets/js/components/ui/SearchForm.vue
@@ -29,12 +29,12 @@ import isMobile from 'ismobilejs'
 import { faSearch } from '@fortawesome/free-solid-svg-icons'
 import { ref } from 'vue'
 import { debounce } from 'lodash'
-import { eventBus, requireInjection } from '@/utils'
-import { RouterKey } from '@/symbols'
+import { eventBus } from '@/utils'
+import { useRouter } from '@/composables'
 
 const placeholder = isMobile.any ? 'Search' : 'Press F to search'
 
-const router = requireInjection(RouterKey)
+const { go } = useRouter()
 
 const input = ref<HTMLInputElement>()
 const q = ref('')
@@ -50,10 +50,10 @@ if (process.env.NODE_ENV !== 'test') {
 
 const onSubmit = () => {
   eventBus.emit('TOGGLE_SIDEBAR')
-  router.go('search')
+  go('search')
 }
 
-const maybeGoToSearchScreen = () => isMobile.any || router.go('search')
+const maybeGoToSearchScreen = () => isMobile.any || go('search')
 
 eventBus.on('FOCUS_SEARCH_FIELD', () => {
   input.value?.focus()
diff --git a/resources/assets/js/components/ui/YouTubeVideoItem.vue b/resources/assets/js/components/ui/YouTubeVideoItem.vue
index 3c87a282..7b460b4d 100644
--- a/resources/assets/js/components/ui/YouTubeVideoItem.vue
+++ b/resources/assets/js/components/ui/YouTubeVideoItem.vue
@@ -11,10 +11,9 @@
 <script lang="ts" setup>
 import { computed, toRefs } from 'vue'
 import { youTubeService } from '@/services'
-import { RouterKey } from '@/symbols'
-import { requireInjection } from '@/utils'
+import { useRouter } from '@/composables'
 
-const router = requireInjection(RouterKey)
+const { go } = useRouter()
 
 const props = defineProps<{ video: YouTubeVideo }>()
 const { video } = toRefs(props)
@@ -23,7 +22,7 @@ const url = computed(() => `https://youtu.be/${video.value.id.videoId}`)
 
 const play = () => {
   youTubeService.play(video.value)
-  router.go('youtube')
+  go('youtube')
 }
 </script>
 
diff --git a/resources/assets/js/components/user/UserCard.vue b/resources/assets/js/components/user/UserCard.vue
index 863ca27b..5b912126 100644
--- a/resources/assets/js/components/user/UserCard.vue
+++ b/resources/assets/js/components/user/UserCard.vue
@@ -32,9 +32,8 @@
 import { faCircleCheck, faShield } from '@fortawesome/free-solid-svg-icons'
 import { computed, toRefs } from 'vue'
 import { userStore } from '@/stores'
-import { eventBus, requireInjection } from '@/utils'
-import { useAuthorization, useDialogBox, useMessageToaster } from '@/composables'
-import { RouterKey } from '@/symbols'
+import { eventBus } from '@/utils'
+import { useAuthorization, useDialogBox, useMessageToaster, useRouter } from '@/composables'
 
 import Btn from '@/components/ui/Btn.vue'
 
@@ -43,13 +42,13 @@ const { user } = toRefs(props)
 
 const { toastSuccess } = useMessageToaster()
 const { showConfirmDialog } = useDialogBox()
-const router = requireInjection(RouterKey)
+const { go } = useRouter()
 
 const { currentUser } = useAuthorization()
 
 const isCurrentUser = computed(() => user.value.id === currentUser.value.id)
 
-const edit = () => isCurrentUser.value ? router.go('profile') : eventBus.emit('MODAL_SHOW_EDIT_USER_FORM', user.value)
+const edit = () => isCurrentUser.value ? go('profile') : eventBus.emit('MODAL_SHOW_EDIT_USER_FORM', user.value)
 
 const confirmDelete = async () =>
   await showConfirmDialog(`You’re about to unperson ${user.value.name}. Are you sure?`) && await destroy()
diff --git a/resources/assets/js/components/utils/GlobalEventListeners.ts b/resources/assets/js/components/utils/GlobalEventListeners.ts
index 9e4c8135..daddea8b 100644
--- a/resources/assets/js/components/utils/GlobalEventListeners.ts
+++ b/resources/assets/js/components/utils/GlobalEventListeners.ts
@@ -5,27 +5,26 @@
 import { defineComponent } from 'vue'
 import { authService } from '@/services'
 import { playlistFolderStore, playlistStore, userStore } from '@/stores'
-import { eventBus, forceReloadWindow, requireInjection } from '@/utils'
-import { RouterKey } from '@/symbols'
-import { useDialogBox, useMessageToaster } from '@/composables'
+import { eventBus, forceReloadWindow } from '@/utils'
+import { useDialogBox, useMessageToaster, useRouter } from '@/composables'
 
 export const GlobalEventListeners = defineComponent({
   setup (props, { slots }) {
     const { toastSuccess } = useMessageToaster()
     const { showConfirmDialog } = useDialogBox()
-    const router = requireInjection(RouterKey)
+    const { go } = useRouter()
 
     eventBus.on('PLAYLIST_DELETE', async playlist => {
       if (await showConfirmDialog(`Delete the playlist "${playlist.name}"?`)) {
         await playlistStore.delete(playlist)
         toastSuccess(`Playlist "${playlist.name}" deleted.`)
-        router.go('home')
+        go('home')
       }
     }).on('PLAYLIST_FOLDER_DELETE', async folder => {
       if (await showConfirmDialog(`Delete the playlist folder "${folder.name}"?`)) {
         await playlistFolderStore.delete(folder)
         toastSuccess(`Playlist folder "${folder.name}" deleted.`)
-        router.go('home')
+        go('home')
       }
     }).on('LOG_OUT', async () => {
       await userStore.logout()
diff --git a/resources/assets/js/composables/index.ts b/resources/assets/js/composables/index.ts
index e60442f3..2e270715 100644
--- a/resources/assets/js/composables/index.ts
+++ b/resources/assets/js/composables/index.ts
@@ -14,3 +14,4 @@ export * from './useFloatingUi'
 export * from './useMessageToaster'
 export * from './useDialogBox'
 export * from './useSmartPlaylistForm'
+export * from './useRouter'
diff --git a/resources/assets/js/composables/useRouter.ts b/resources/assets/js/composables/useRouter.ts
new file mode 100644
index 00000000..bab85e0f
--- /dev/null
+++ b/resources/assets/js/composables/useRouter.ts
@@ -0,0 +1,16 @@
+import { RouterKey } from '@/symbols'
+import { requireInjection } from '@/utils'
+
+export const useRouter = () => {
+  const router = requireInjection(RouterKey)
+
+  return {
+    go: router.go.bind(router),
+    onRouteChanged: router.onRouteChanged.bind(router),
+    resolveRoute: router.resolve.bind(router),
+    triggerNotFound: router.triggerNotFound.bind(router),
+    getRouteParam: (name: string) => router.$currentRoute.value?.params?.[name],
+    getCurrentScreen: () => router.$currentRoute.value?.screen,
+    isCurrentScreen: (...screens: ScreenName[]) => screens.includes(router.$currentRoute.value?.screen!)
+  }
+}
diff --git a/resources/assets/js/composables/useScreen.ts b/resources/assets/js/composables/useScreen.ts
index 69538d8d..8376a3f2 100644
--- a/resources/assets/js/composables/useScreen.ts
+++ b/resources/assets/js/composables/useScreen.ts
@@ -1,9 +1,8 @@
-import { RouterKey } from '@/symbols'
-import { requireInjection } from '@/utils'
+import { useRouter } from '@/composables'
 
 export const useScreen = (screen: ScreenName) => {
-  const router = requireInjection(RouterKey)
-  const onScreenActivated = (cb: Closure) => router.onRouteChanged(route => route.screen === screen && cb())
+  const { onRouteChanged } = useRouter()
+  const onScreenActivated = (cb: Closure) => onRouteChanged(route => route.screen === screen && cb())
 
   return {
     onScreenActivated
diff --git a/resources/assets/js/composables/useSongList.ts b/resources/assets/js/composables/useSongList.ts
index 2caef0fa..b7f9703f 100644
--- a/resources/assets/js/composables/useSongList.ts
+++ b/resources/assets/js/composables/useSongList.ts
@@ -3,16 +3,10 @@ import isMobile from 'ismobilejs'
 import { computed, reactive, Ref, ref } from 'vue'
 import { playbackService } from '@/services'
 import { queueStore, songStore } from '@/stores'
-import { eventBus, provideReadonly, requireInjection } from '@/utils'
+import { eventBus, provideReadonly } from '@/utils'
+import { useRouter } from '@/composables'
 
-import {
-  RouterKey,
-  SelectedSongsKey,
-  SongListConfigKey,
-  SongListSortFieldKey,
-  SongListSortOrderKey,
-  SongsKey
-} from '@/symbols'
+import { SelectedSongsKey, SongListConfigKey, SongListSortFieldKey, SongListSortOrderKey, SongsKey } from '@/symbols'
 
 import ControlsToggle from '@/components/ui/ScreenControlsToggle.vue'
 import SongList from '@/components/song/SongList.vue'
@@ -21,9 +15,9 @@ import ThumbnailStack from '@/components/ui/ThumbnailStack.vue'
 
 export const useSongList = (songs: Ref<Song[]>, config: Partial<SongListConfig> = {}) => {
   config = reactive(config)
-  const router = requireInjection(RouterKey)
+  const { isCurrentScreen, go, onRouteChanged } = useRouter()
 
-  router.onRouteChanged(route => {
+  onRouteChanged(route => {
     config.reorderable = route.screen === 'Queue'
     config.sortable = !['Queue', 'RecentlyPlayed', 'Search.Songs'].includes(route.screen)
   })
@@ -51,7 +45,7 @@ export const useSongList = (songs: Ref<Song[]>, config: Partial<SongListConfig>
 
   const playAll = (shuffle: boolean) => {
     playbackService.queueAndPlay(getSongsToPlay(), shuffle)
-    router.go('queue')
+    go('queue')
   }
 
   const playSelected = (shuffle: boolean) => playbackService.queueAndPlay(selectedSongs.value, shuffle)
@@ -73,13 +67,13 @@ export const useSongList = (songs: Ref<Song[]>, config: Partial<SongListConfig>
       await playbackService.play(selectedSongs.value[0])
     }
 
-    router.go('queue')
+    go('queue')
   }
 
   const sortField = ref<SongListSortField | null>(((): SongListSortField | null => {
     if (!config.sortable) return null
-    if (router.$currentRoute.value.screen === 'Album' || router.$currentRoute.value.screen === 'Artist') return 'track'
-    if (router.$currentRoute.value.screen === 'Search.Songs') return null
+    if (isCurrentScreen('Artist', 'Album')) return 'track'
+    if (isCurrentScreen('Search.Songs', 'Queue', 'RecentlyPlayed')) return null
     return 'title'
   })())
 
diff --git a/resources/assets/js/composables/useUpload.ts b/resources/assets/js/composables/useUpload.ts
index 01a0b816..3f39dcb3 100644
--- a/resources/assets/js/composables/useUpload.ts
+++ b/resources/assets/js/composables/useUpload.ts
@@ -1,17 +1,15 @@
 import isMobile from 'ismobilejs'
 import { computed, toRef } from 'vue'
-import { useAuthorization, useMessageToaster } from '@/composables'
 import { settingStore } from '@/stores'
 import { acceptedMediaTypes } from '@/config'
 import { UploadFile, uploadService } from '@/services'
-import { getAllFileEntries, pluralize, requireInjection } from '@/utils'
-import { RouterKey } from '@/symbols'
+import { getAllFileEntries, pluralize } from '@/utils'
+import { useAuthorization, useMessageToaster, useRouter } from '@/composables'
 
 export const useUpload = () => {
   const { isAdmin } = useAuthorization()
   const { toastSuccess, toastWarning } = useMessageToaster()
-
-  const router = requireInjection(RouterKey)
+  const { go, isCurrentRoute } = useRouter()
 
   const mediaPath = toRef(settingStore.state, 'media_path')
 
@@ -47,7 +45,7 @@ export const useUpload = () => {
 
     if (queuedFiles.length) {
       toastSuccess(`Queued ${pluralize(queuedFiles, 'file')} for upload`)
-      router.$currentRoute.value.screen === 'Upload' || router.go('upload')
+      isCurrentRoute('Upload') || go('upload')
     } else {
       toastWarning('No files applicable for upload')
     }
diff --git a/resources/assets/js/symbols.ts b/resources/assets/js/symbols.ts
index 6f61144e..3d636d7c 100644
--- a/resources/assets/js/symbols.ts
+++ b/resources/assets/js/symbols.ts
@@ -6,7 +6,6 @@ import Router from '@/router'
 export type ReadonlyInjectionKey<T> = InjectionKey<[Readonly<T> | DeepReadonly<T>, Closure]>
 
 export const RouterKey: InjectionKey<Router> = Symbol('Router')
-
 export const DialogBoxKey: InjectionKey<Ref<InstanceType<typeof DialogBox>>> = Symbol('DialogBox')
 export const MessageToasterKey: InjectionKey<Ref<InstanceType<typeof MessageToaster>>> = Symbol('MessageToaster')